Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2d0b84a016 | |||
| f90a3a3223 | |||
| b67a9c8e99 | |||
| 97c3afb745 | |||
| c89fffde96 |
@@ -1,29 +0,0 @@
|
||||
diff -up ./bindings/ruby/Makefile.am.diff ./bindings/ruby/Makefile.am
|
||||
--- ./bindings/ruby/Makefile.am.diff 2010-08-02 16:57:20.407937479 -0500
|
||||
+++ ./bindings/ruby/Makefile.am 2010-08-02 16:57:54.718188163 -0500
|
||||
@@ -4,8 +4,10 @@
|
||||
|
||||
SUBDIRS = openwsman tests
|
||||
|
||||
-rubyarchdir = $(shell ruby -r rbconfig -e "vad = Config::CONFIG['vendorarchdir']; print(vad ? vad : Config::CONFIG['sitearchdir'])")
|
||||
-rubydir = $(shell ruby -r rbconfig -e "vd = Config::CONFIG['vendorlibdir']; print(vd ? vd : Config::CONFIG['sitelibdir'])")
|
||||
+#rubyarchdir = $(shell ruby -r rbconfig -e "vad = Config::CONFIG['vendorarchdir']; print(vad ? vad : Config::CONFIG['sitearchdir'])")
|
||||
+rubyarchdir = $(shell ruby -r rbconfig -e " print( Config::CONFIG['sitearchdir'])")
|
||||
+#rubydir = $(shell ruby -r rbconfig -e "vd = Config::CONFIG['vendorlibdir']; print(vd ? vd : Config::CONFIG['sitelibdir'])")
|
||||
+rubydir = $(shell ruby -r rbconfig -e " print(Config::CONFIG['sitelibdir'])")
|
||||
rubyincdir = $(shell ruby -r rbconfig -e "print(Config::CONFIG['archdir'])")
|
||||
|
||||
INCLUDES = \
|
||||
diff -up ./bindings/ruby/openwsman/Makefile.am.diff ./bindings/ruby/openwsman/Makefile.am
|
||||
--- ./bindings/ruby/openwsman/Makefile.am.diff 2010-08-02 16:58:05.201189127 -0500
|
||||
+++ ./bindings/ruby/openwsman/Makefile.am 2010-08-02 16:58:20.999937941 -0500
|
||||
@@ -2,7 +2,8 @@
|
||||
# Makefile.am for openwsman/bindings/ruby/openwsman
|
||||
#
|
||||
|
||||
-rubylibdir = $(shell ruby -r rbconfig -e "vld = Config::CONFIG['vendorlibdir']; print(vld ? vld : Config::CONFIG['sitelibdir'])")
|
||||
+#rubylibdir = $(shell ruby -r rbconfig -e "vld = Config::CONFIG['vendorlibdir']; print(vld ? vld : Config::CONFIG['sitelibdir'])")
|
||||
+rubylibdir = $(shell ruby -r rbconfig -e "print( Config::CONFIG['sitelibdir'])")
|
||||
|
||||
install-data-local:
|
||||
$(mkinstalldirs) $(DESTDIR)$(rubylibdir)/openwsman
|
||||
@@ -1,82 +0,0 @@
|
||||
diff -up ./acinclude.m4.old ./acinclude.m4
|
||||
--- ./acinclude.m4.old 2010-08-02 12:13:27.135937703 -0500
|
||||
+++ ./acinclude.m4 2010-08-02 12:15:07.896938631 -0500
|
||||
@@ -157,6 +157,20 @@ AC_SUBST(SFCC_LDFLAGS)
|
||||
# may extend this special exception to the GPL to apply to your
|
||||
# modified version as well.
|
||||
|
||||
+AC_DEFUN([SWIG_VERSION_GOOD],[
|
||||
+ AC_MSG_NOTICE([SWIG executable is '$SWIG'])
|
||||
+ SWIG_LIB=`$SWIG -swiglib`
|
||||
+ AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
|
||||
+ SWIG_VERSION=`echo $(( $available_major * 100 * 100 + $available_minor * 100 + $available_patch ))`
|
||||
+ AC_MSG_NOTICE([SWIG version is '$SWIG_VERSION'])
|
||||
+ # AM_CONDITIONAL(SWIG_NEW_OPTIONS, test "$SWIG_VERSION" \> 10331)
|
||||
+])
|
||||
+
|
||||
+AC_DEFUN([SWIG_VERSION_BAD],[
|
||||
+ AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org])
|
||||
+ SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
|
||||
+])
|
||||
+
|
||||
AC_DEFUN([AC_PROG_SWIG],[
|
||||
AC_PATH_PROG([SWIG],[swig])
|
||||
if test -z "$SWIG" ; then
|
||||
@@ -199,19 +213,44 @@ AC_DEFUN([AC_PROG_SWIG],[
|
||||
if test -z "$available_patch" ; then
|
||||
[available_patch=0]
|
||||
fi
|
||||
- if test $available_major -ne $required_major \
|
||||
- -o $available_minor -ne $required_minor \
|
||||
- -o $available_patch -lt $required_patch ; then
|
||||
- AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org])
|
||||
- SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
|
||||
- else
|
||||
- AC_MSG_NOTICE([SWIG executable is '$SWIG'])
|
||||
- SWIG_LIB=`$SWIG -swiglib`
|
||||
- AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
|
||||
- SWIG_VERSION=`echo $(( $available_major * 100 * 100 + $available_minor * 100 + $available_patch ))`
|
||||
- AC_MSG_NOTICE([SWIG version is '$SWIG_VERSION'])
|
||||
- # AM_CONDITIONAL(SWIG_NEW_OPTIONS, test "$SWIG_VERSION" \> 10331)
|
||||
- fi
|
||||
+
|
||||
+
|
||||
+
|
||||
+ if test $available_major -gt $required_major; then
|
||||
+ # the available major is greater than required major --GOOD
|
||||
+ SWIG_VERSION_GOOD()
|
||||
+
|
||||
+ elif test $available_major -lt $required_major ; then
|
||||
+ # the avialable major is less than required major -- BAD
|
||||
+ SWIG_VERSION_BAD()
|
||||
+ else
|
||||
+ # the available and require major are equal check the minor and patch versions.
|
||||
+
|
||||
+ if test $available_minor -gt $required_minor ; then
|
||||
+ # GOOD
|
||||
+ SWIG_VERSION_GOOD()
|
||||
+ elif test $avaialble_minor -lt $required_minor ; then
|
||||
+ # BAD
|
||||
+ SWIG_VERSION_BAD()
|
||||
+ else
|
||||
+ # the minor version are also equal
|
||||
+
|
||||
+ if test $available_patch -gt $required_patch ; then
|
||||
+ # GOOD
|
||||
+ SWIG_VERSION_GOOD()
|
||||
+ elif test $available_minor -lt $required_minor ; then
|
||||
+ # BAD
|
||||
+ SWIG_VERSION_BAD()
|
||||
+ else
|
||||
+ # all the available major, minor and patch levels are the same as the required -- GOOD
|
||||
+ SWIG_VERSION_GOOD()
|
||||
+ fi
|
||||
+ fi
|
||||
+ fi
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
else
|
||||
AC_MSG_WARN([cannot determine SWIG version])
|
||||
SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false'
|
||||
+11
-38
@@ -1,7 +1,6 @@
|
||||
#
|
||||
# spec file for package openwsman (Version 2.2.3)
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
||||
@@ -17,7 +16,7 @@ BuildRequires: perl-devel pkgconfig openssl-devel
|
||||
BuildRequires: libtool
|
||||
Requires: net-tools
|
||||
Version: 2.2.3
|
||||
Release: 8%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Url: http://www.openwsman.org/
|
||||
License: BSD
|
||||
Group: Applications/System
|
||||
@@ -26,8 +25,6 @@ Source: http://downloads.sourceforge.net/project/openwsman/%{name}/%{ver
|
||||
Patch0: %{name}-initscript.patch
|
||||
Patch1: %{name}-randfile.patch
|
||||
Patch2: %{name}-authors.patch
|
||||
Patch3: %{name}-swig-ver-check.patch
|
||||
Patch4: %{name}-sitelibdir.patch
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
|
||||
|
||||
%description
|
||||
@@ -87,7 +84,6 @@ Openwsman Client libraries
|
||||
License: BSD
|
||||
Group: System Environment/Daemons
|
||||
Requires: net-tools
|
||||
Requires: openssl
|
||||
Requires(post): chkconfig
|
||||
Requires(preun): chkconfig
|
||||
Requires(postun): initscripts
|
||||
@@ -136,15 +132,11 @@ This package provides Perl bindings to access the openwsman client API.
|
||||
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
|
||||
%build
|
||||
sh autoconfiscate.sh
|
||||
@@ -188,14 +180,13 @@ rm -rf %{buildroot}
|
||||
chkconfig --add openwsmand
|
||||
|
||||
%preun server
|
||||
if [ $1 = 0 ] ; then
|
||||
if [ $1 = "0" ] ; then
|
||||
/sbin/service %{name}d stop >/dev/null 2>&1
|
||||
/sbin/chkconfig --del openwsmand
|
||||
fi
|
||||
|
||||
%postun server
|
||||
rm -f /var/log/wsmand.log
|
||||
|
||||
if [ "$1" -ge "1" ] ; then
|
||||
/sbin/service %{name}d condrestart >/dev/null 2>&1 || :
|
||||
fi
|
||||
@@ -270,25 +261,11 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Aug 6 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3.8
|
||||
- Added openssl among the dependencies of server
|
||||
- The init script will break and ask the user to create a cert manually if
|
||||
- none exists.
|
||||
* Tue Aug 10 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-3
|
||||
- Moved the certificate generation from the init script. The user has to
|
||||
- manually generate on before starting the service.
|
||||
|
||||
* Mon Aug 2 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-7
|
||||
- Forcing all the ruby files to be installed in site{arch,lib}dir instead
|
||||
- of vendor{arch,lib}dir following Fedora guidelines
|
||||
|
||||
* Mon Aug 2 2010 Praveen K Paladugu <praveen_paladugu@dell.com> -2.2.3-6
|
||||
- Fixed swig version checking in acinclude.m4
|
||||
|
||||
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 2.2.3-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||
|
||||
* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 2.2.3-4
|
||||
- Mass rebuild with perl-5.12.0
|
||||
|
||||
* Tue Apr 22 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-3
|
||||
* Thu Apr 22 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-2
|
||||
- authors.patch: Moved all the AUTHORS info to AUTHORS file.
|
||||
- Corrected the Source tag.
|
||||
- Corrected the package dependencies to break cyclic dependencies.
|
||||
@@ -300,21 +277,16 @@ fi
|
||||
- some of the source files explicitly call out for *.so files.
|
||||
|
||||
|
||||
* Thu Apr 15 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-2
|
||||
- Updated the spec file to adhere to the upstream standard of breaking
|
||||
- the package in server, client, lib modules
|
||||
* Fri Apr 16 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-1
|
||||
- Updated the sources to 2.2.3
|
||||
- Updated the spec file to follow the upstream packaging format.
|
||||
- randfile.patch: when openwsmand daemon creates a certificate the
|
||||
- first time it needs a file which have random content it. This
|
||||
- is pointed to $HOME/.rnd in /etc/openwsman/ssleay.cnf. Changed this
|
||||
- random file to /dev/urandom.
|
||||
- random file to /dev/urandom.
|
||||
- initscript.patch: patch to edit the init script so that the services
|
||||
- are not started by default.
|
||||
|
||||
|
||||
* Wed Mar 3 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.3-1
|
||||
- Update to openwsman-2.2.3
|
||||
|
||||
|
||||
* Wed Sep 23 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-1
|
||||
- Added the new 2.2.0 sources.
|
||||
- Changed the release and version numbers.
|
||||
@@ -333,3 +305,4 @@ fi
|
||||
|
||||
* Tue Aug 19 2008 <srinivas_ramanatha@dell.com> - 2.0.0-1%{?dist}
|
||||
- Modified the spec file to adhere to fedora packaging guidelines.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user