diff --git a/.gitignore b/.gitignore index f3118bf..cba52c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ openwsman-2.2.3.tar.bz2 /openwsman-2.2.4.tar.bz2 /openwsman-2.2.5.tar.bz2 +/openwsman-2.2.7.tar.bz2 diff --git a/openwsman-2.2.3-initscript.patch b/openwsman-2.2.3-initscript.patch index 432e962..768f0aa 100644 --- a/openwsman-2.2.3-initscript.patch +++ b/openwsman-2.2.3-initscript.patch @@ -1,11 +1,11 @@ -diff -up openwsman-2.2.4/etc/init/openwsmand.sh.cmake.orig openwsman-2.2.4/etc/init/openwsmand.sh.cmake ---- openwsman-2.2.4/etc/init/openwsmand.sh.cmake.orig 2010-10-06 11:10:10.000000000 +0200 -+++ openwsman-2.2.4/etc/init/openwsmand.sh.cmake 2010-11-11 16:52:19.494661859 +0100 +diff -up openwsman-2.2.7/etc/init/openwsmand.sh.cmake.orig openwsman-2.2.7/etc/init/openwsmand.sh.cmake +--- openwsman-2.2.7/etc/init/openwsmand.sh.cmake.orig 2012-01-11 13:38:58.789392556 +0100 ++++ openwsman-2.2.7/etc/init/openwsmand.sh.cmake 2012-01-11 13:44:32.383593944 +0100 @@ -4,28 +4,28 @@ # Provides: openwsmand # Required-Start: $remote_fs # Required-Stop: $network --# Default-Start: 2 3 4 5 +-# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 +# Default-Start: +# Default-Stop: @@ -57,16 +57,16 @@ diff -up openwsman-2.2.4/etc/init/openwsmand.sh.cmake.orig openwsman-2.2.4/etc/i echo " running" else echo " stopped" -+ if [ -e $PIDFILE ]; then -+ echo " stopped, but pid file exists" -+ exit 1 -+ elif [ -e $lockfile ]; then -+ echo " stopped, but lock file exists" -+ exit 2 -+ else -+ echo " stopped" -+ exit 3 -+ fi ++ if [ -e $PIDFILE ]; then ++ echo " stopped, but pid file exists" ++ exit 1 ++ elif [ -e $lockfile ]; then ++ echo " stopped, but lock file exists" ++ exit 2 ++ else ++ echo " stopped" ++ exit 3 ++ fi fi fi ;; diff --git a/openwsman.spec b/openwsman.spec index f57cf96..e3b4753 100644 --- a/openwsman.spec +++ b/openwsman.spec @@ -13,8 +13,8 @@ BuildRequires: python python-devel ruby ruby-devel ruby-rdoc perl BuildRequires: perl-devel pkgconfig openssl-devel BuildRequires: cmake Requires: net-tools -Version: 2.2.5 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Url: http://www.openwsman.org/ License: BSD Group: Applications/System @@ -170,6 +170,7 @@ rm -f %{buildroot}/%{_libdir}/*.la rm -f %{buildroot}/%{_libdir}/openwsman/plugins/*.la rm -f %{buildroot}/%{_libdir}/openwsman/authenticators/*.la [ -d %{buildroot}/%{ruby_sitelib} ] && rm -f %{buildroot}/%{ruby_sitelib}/openwsmanplugin.rb +[ -d %{buildroot}/%{ruby_sitelib} ] && rm -f %{buildroot}/%{ruby_sitelib}/openwsman.rb [ -d %{buildroot/}%{ruby_vendorlib} ] && rm -f %{buildroot}/%{ruby_vendorlib}/openwsmanplugin.rb mkdir -p %{buildroot}%{_sysconfdir}/init.d install -m 644 etc/openwsman.conf %{buildroot}/%{_sysconfdir}/openwsman @@ -239,7 +240,8 @@ fi %files ruby %defattr(-,root,root,-) -%{ruby_sitearch}/openwsman.so +#%{ruby_sitearch}/openwsman.so +%{ruby_sitearch}/_openwsman.so %dir %{ruby_sitelib}/openwsman %{ruby_sitelib}/openwsman/*.rb %doc AUTHORS COPYING ChangeLog README @@ -281,6 +283,9 @@ fi %changelog +* Wed Jan 11 2012 Vitezslav Crhonek - 2.2.7-1 +- Update to openwsman-2.2.7 + * Mon Jun 20 2011 Marcela Mašláňová - 2.2.5-3 - Perl mass rebuild diff --git a/sources b/sources index 60331b2..153c22d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 3958e97476aa94c506075e3cd165240d openwsman-2.2.5.tar.bz2 +c72e3b34e25f393be8fd1ead6b4a5bae openwsman-2.2.7.tar.bz2