Rename service file

https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild

.gitignore

@@ -1 +1,4 @@
-openwsman-2.2.0.tar.bz2
+openwsman-2.2.3.tar.bz2
+/openwsman-2.2.4.tar.bz2
+/openwsman-2.2.5.tar.bz2
+/openwsman-2.2.7.tar.bz2

openwsman-2.2.3-initscript.patch

@@ -0,0 +1,81 @@
+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 5
+-# Default-Stop: 0 1 6 
++# Default-Start:
++# Default-Stop:
+ # Short-Description: Openwsman Daemon
+ # Description: openwsmand
+ #       Start/Stop the Openwsman Daemon
+ ### END INIT INFO
+ #
+ #
+-# chkconfig: 2345 36 64
++# chkconfig: - 36 64
+ # description: Openwsman Daemon
+ # processname: openwsmand
+ 
+ NAME=openwsmand
+ DAEMON=/usr/sbin/$NAME
+ OPTIONS=-S # with SSL
+-PIDFILE=/var/run/$NAME.pid
++PIDFILE=/var/run/wsmand.pid
+ 
+ lsb=0
+ 
+ if [ $EUID != 0 ]; then
+  echo "This script must be run as root."
+- exit 1;
++ exit 4;
+ fi
+ 
+ if [ "$DESCRIPTIVE" = "" ]; then
+@@ -65,6 +65,7 @@ start()
+ 
+ 	echo "NOTE: The script uses /dev/random device for generating some random bits while generating the server key."
+ 	echo "      If this takes too long, you can replace the value of \"RANDFILE\" in @SYSCONFDIR@/ssleay.cnf with /dev/urandom. Please understand the implications of replacing the RNADFILE."
++	exit 6 # Six means "program is not configured", seems to be suitable value
+ 		
+       fi
+     fi
+@@ -103,6 +104,9 @@ case "$1" in
+     stop)
+     	stop
+ 	rm -f $lockfile
++	# pid file should be removed by server itself, but it's marked as
++	# TODO in wsmand.c source file;)
++	rm -f $PIDFILE
+     ;;
+ 
+     restart)
+@@ -137,6 +141,16 @@ case "$1" in
+         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
+       fi
+     fi
+     ;;
+@@ -147,6 +161,8 @@ case "$1" in
+ 
+     *)
+     echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}"
++    [ "$1" = "usage" ] && exit 0
++    exit 2
+ esac
+ 
+ if [ $lsb -ne 0 ]; then

openwsman-2.2.7-disable-ruby.patch

@@ -0,0 +1,12 @@
+diff -up openwsman-2.2.7/CMakeLists.txt.ruby openwsman-2.2.7/CMakeLists.txt
+--- openwsman-2.2.7/CMakeLists.txt.ruby	2012-02-09 09:13:51.222066933 +0100
++++ openwsman-2.2.7/CMakeLists.txt	2012-02-09 09:14:01.059119669 +0100
+@@ -103,7 +103,7 @@ SET( BUILD_JAVA_EXPLICIT ${BUILD_JAVA})
+ OPTION( BUILD_LIBCIM "Build CIM plugin" YES )
+ OPTION( BUILD_EXAMPLES "Build examples" YES )
+ OPTION( BUILD_PYTHON "Build Python bindings" YES )
+-OPTION( BUILD_RUBY "Build Ruby bindings" YES )
++OPTION( BUILD_RUBY "Build Ruby bindings" NO )
+ OPTION( BUILD_PERL "Build Perl bindings" YES )
+ OPTION( BUILD_JAVA "Build Java bindings" YES )
+ OPTION( BUILD_CSHARP "Build C# bindings" YES)

openwsman-initscript.patch

@@ -1,128 +0,0 @@
-diff -up ./etc/init/openwsmand.sh.in.new ./etc/init/openwsmand.sh.in
---- ./etc/init/openwsmand.sh.in.new	2009-12-16 18:16:06.000000000 -0600
-+++ ./etc/init/openwsmand.sh.in	2009-12-16 18:16:18.000000000 -0600
-@@ -4,21 +4,21 @@
- # Provides: openwsmand
- # Required-Start: $remote_fs
- # Required-Stop: $network
--# Default-Start: 2 3 4 5
--# Default-Stop: 0 1 6 
-+# Default-Start:
-+# Default-Stop:
- # Short-Description: Openwsman Daemon
- # Description: openwsmand
- #       Start/Stop the Openwsman Daemon
- ### END INIT INFO
- #
- #
--# chkconfig: 2345 36 64
-+# chkconfig: - 36 64
- # description: Openwsman Daemon
- # processname: openwsmand
- 
- NAME=openwsmand
- DAEMON=/usr/sbin/$NAME
--OPTIONS=
-+OPTIONS=-S
- PIDFILE=/var/run/$NAME.pid
- 
- if [ $EUID != 0 ]; then
-@@ -37,12 +37,14 @@ lockfile=${SVIlock:-/var/lock/subsys/$NA
- if [ -f "/etc/sysconfig/openwsman" ]; then
-     . /etc/sysconfig/openwsman
- fi
--# See how we were called.
--. /etc/rc.status
- 
--# Reset status of this service
--rc_reset
-+if [ -f "/etc/SuSe-release" ]; then
-+     # See how we were called.
-+     . /etc/rc.status
- 
-+     # Reset status of this service
-+     rc_reset
-+fi
- 
- case "$1" in
-     start)
-@@ -71,16 +73,28 @@ EOF
- 
-     # Start daemons.
-     echo -n "Starting the $DESCRIPTIVE"
--    startproc -p $PIDFILE $DAEMON > /dev/null 2>&1
--    rc_status -v
-+    if [ -f "/etc/SuSe-release" ]; then
-+    	startproc -p $PIDFILE $DAEMON > /dev/null 2>&1
-+    	rc_status -v
-+    elif [ -f "/etc/redhat-release" ]; then
-+    	$DAEMON -S && echo "          done." || echo "   failed."
-+    fi
-+    
-     touch $lockfile
-     ;;
- 
-     stop)
-     # Stop daemons.
-     echo -n "Shutting down $DESCRIPTIVE"
--    killproc -p $PIDFILE -TERM $DAEMON
--    rc_status -v
-+    if [ -f "/etc/SuSe-release" ]; then
-+       killproc -p $PIDFILE -TERM $DAEMON
-+       rc_status -v
-+    elif [ -f "/etc/redhat-release" ]; then
-+       kill -9 `pidof openwsmand` > /dev/null 2>&1
-+          if [ $? -eq 0 ]; then
-+             echo "         done"
-+          fi
-+    fi
-     rm -f $lockfile
-     ;;
- 
-@@ -91,19 +105,40 @@ EOF
-     ;;
- 
-     reload)
--    echo -n "Reload service $DESCRIPTIVE"
--    killproc -p $PIDFILE  -HUP $DAEMON
--    rc_status -v
-+    echo -n "Reloading service $DESCRIPTIVE"
-+    if [ -f "/etc-SuSe-release" ]; then
-+    	killproc -p $PIDFILE  -HUP $DAEMON
-+    	rc_status -v
-+    elif [ -f "/etc/redhat-release" ]; then
-+    	killall -HUP openwsmad && echo "            done."|| echo "    failed."
-+    fi
-     ;;
- 
-     status)
-     echo -n "Checking for service $DESCRIPTIVE"
--    checkproc -p $PIDFILE $DAEMON
--    rc_status -v
-+    if [ -f "/etc/SuSe-release" ]; then
-+        checkproc -p $PIDFILE $DAEMON
-+        rc_status -v
-+    elif [ -f "/etc/redhat-release" ]; then
-+        pidof opewsmand > /dev/null 2>&1
-+        if [ $? -eq 0 ]; then
-+           echo "         running"
-+        else
-+           echo "         stopped"
-+        fi 
-+    fi
-+        
-+    ;;
-+    condrestart)
-+       [ -f $lockfile ] && restart || :
-     ;;
- 
-     *)
--    echo "Usage: $0 {restart|start|stop|reload|force-reload|status}"
-+    echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}"
- esac
- 
-+if [ -f "/etc/SuSe-release" ]; then
- rc_exit
-+elif [ -f "/etc/redhat-release" ]; then
-+exit 0 
-+fi

openwsman-pam-auth.patch

@@ -1,24 +0,0 @@
-Index: openwsman.conf
-===================================================================
---- openwsman-2.0.0/etc/openwsman.conf	(revision 3221)
-+++ openwsman-2.0.0/etc/openwsman.conf	(working copy)
-@@ -4,7 +4,7 @@
- ssl_cert_file = /etc/openwsman/servercert.pem
- ssl_key_file = /etc/openwsman/serverkey.pem
- digest_password_file = /etc/openwsman/digest_auth.passwd
--basic_password_file = /etc/openwsman/simple_auth.passwd
-+#basic_password_file = /etc/openwsman/simple_auth.passwd
- 
- min_threads = 4
- max_threads = 10
-@@ -15,8 +15,8 @@
- # Authentication backend for BASIC authentication. Default is to read a configuration file defined with 'basic_password_file'
- #
- 
--#basic_authenticator = libwsman_pam_auth.so
--#basic_authenticator_arg = openwsman
-+basic_authenticator = libwsman_pam_auth.so
-+basic_authenticator_arg = openwsman
- 
- #
- # WS-Management unauthenticated wsmid:Identify file

openwsman-randfile.patch

@@ -1,12 +0,0 @@
-diff -up ./etc/ssleay.cnf.new ./etc/ssleay.cnf
---- ./etc/ssleay.cnf.new	2009-12-16 17:04:15.000000000 -0600
-+++ ./etc/ssleay.cnf	2009-12-16 17:04:55.000000000 -0600
-@@ -2,7 +2,7 @@
- # SSLeay example configuration file.
- #
- 
--RANDFILE                = $ENV::HOME/.rnd
-+RANDFILE                = /dev/random
- 
- [ req ]
- default_bits            = 1024

openwsman-sitelibdir.patch

@@ -0,0 +1,29 @@
+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

openwsman.spec

@@ -1,62 +1,78 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
 %{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
 %{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
-Name:          openwsman
-Version:       2.2.0
-Release:        8%{?dist}
-License:        BSD
+Name:           openwsman
+BuildRequires:  swig
+BuildRequires:  libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
+#BuildRequires:  python python-devel ruby ruby-devel ruby-rdoc perl
+BuildRequires:  python python-devel perl
+BuildRequires:  perl-devel pkgconfig openssl-devel
+BuildRequires:  cmake
+BuildRequires:  systemd-units
+Version:        2.2.7
+Release:        5%{?dist}
 Url:            http://www.openwsman.org/
-Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source2:        python-config
-Patch0:         %{name}-initscript.patch
-Patch1:         %{name}-pam-auth.patch
-Patch2:         perl-bindings.patch
-Patch3:         openwsman-randfile.patch
+License:        BSD
+Group:          Applications/System
+Summary:        Open source Implementation of WS-Management
+Source:         http://downloads.sourceforge.net/project/openwsman/%{name}/%{version}/%{name}-%{version}.tar.bz2
+# help2man generated manpage for openwsmand binary
+Source1:        openwsmand.8.gz
+# service file for systemd
+Source2:        openwsmand.service
+# script for testing presence of the certificates in ExecStartPre
+Source3:        owsmantestcert.sh
+Patch0:         %{name}-sitelibdir.patch
+Patch2:         openwsman-2.2.7-disable-ruby.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
-Group:          System Environment/Daemons
-Summary:        Opensource Implementation of WS-Management
-BuildRequires:  sblim-sfcc-devel curl-devel libxml2-devel pkgconfig pam-devel openssl-devel swig python python-devel ruby ruby-devel libtool
-BuildRequires:  perl pkgconfig openssl-devel net-tools
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(postun): initscripts
 
 %description
 Openwsman is a project intended to provide an open-source
-implementation of the Web Services Management specification
+implementation of the Web Services Management specipication
 (WS-Management) and to expose system management information on the
 Linux operating system using the WS-Management protocol. WS-Management
 is based on a suite of web services specifications and usage
 requirements that exposes a set of operations focused on and covers
 all system management aspects.
 
+
+
+
 %package -n libwsman1
 License:        BSD
 Group:          System Environment/Libraries
-Summary:        Opensource Implementation of WS-Management
+Summary:        Open source Implementation of WS-Management
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
-Requires:       %{name}-client
 
 %description -n libwsman1
 Openwsman library for packages dependent on openwsman
+
+
+
+
 %package -n libwsman-devel
 License:        BSD
 Group:          Development/Libraries
-Summary:        Opensource Implementation of WS-Management
+Summary:        Open source Implementation of WS-Management
 Provides:       %{name}-devel = %{version}
 Obsoletes:      %{name}-devel < %{version}
 Requires:       libwsman1 = %{version}
 Requires:       %{name}-server = %{version}
 Requires:       %{name}-client = %{version}
 Requires:       sblim-sfcc-devel libxml2-devel pam-devel
-Requires:       curl-devel
+Requires:       libcurl-devel
 
 %description -n libwsman-devel
 Development files for openwsman
 
+
+
 %package client
 License:        BSD
 Group:          System Environment/Libraries
@@ -65,11 +81,13 @@ Summary:        Openwsman Client libraries
 %description client
 Openwsman Client libraries
 
+
+
+
 %package server
 License:        BSD
 Group:          System Environment/Daemons
 Requires:       net-tools
-Requires:       openwsman-client
 Requires(post):       chkconfig
 Requires(preun):      chkconfig
 Requires(postun):     initscripts
@@ -79,6 +97,8 @@ Summary:        Openwsman Server and service libraries
 Openwsman Server and service libraries
 
 
+
+
 %package python
 License:        BSD
 Group:          Development/Libraries
@@ -89,15 +109,21 @@ Requires:       python
 This package provides Python bindings to access the openwsman client
 API.
 
-%package ruby
-License:        BSD
-Group:          Development/Libraries
-Requires:       ruby
-Requires:       ruby-libs >= 1.8
-Summary:        Ruby bindings for openwsman client API
 
-%description ruby
-This package provides Ruby bindings to access the openwsman client API.
+
+
+#%package ruby
+#License:        BSD
+#Group:          Development/Libraries
+#Requires:       ruby
+#Requires:       ruby(abi) = 1.9.1
+#Summary:        Ruby bindings for openwsman client API
+#
+#%description ruby
+#This package provides Ruby bindings to access the openwsman client API.
+
+
+
 
 %package perl
 License:        BSD
@@ -111,55 +137,88 @@ This package provides Perl bindings to access the openwsman client API.
 
 
 
-
 %prep
-%setup -q 
+%setup -q
+# don't make backup of file patched by patch0, it'll be installed...
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
-%patch3 -p1
-cp -p %{SOURCE2} %{_builddir}/%{name}-%{version}
-sed -i -e 's|#!/usr/bin/python2.5|#!%{__python}|' %{_builddir}/%{name}-%{version}/python-config
 
 %build
-sh autoconfiscate.sh
-chmod a-x src/lib/*.[ch]
-chmod a-x src/cpp/*.[ch]
-chmod a-x include/*.[ch]
+# Removing executable permissions on .c and .h files to fix rpmlint warnings. 
+chmod -x src/cpp/WsmanClient.h
 
-# disable eventing, as Fedora libcurl isn't linked against openssl
-# disable tests in 2.1.0, http://www.openwsman.org/bug/263
-%configure  --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings --disable-static --enable-perl --enable-ipv6 PATH=$PATH:.
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA"
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags}
+rm -rf build
+mkdir build
+
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA -DNO_SSL_CALLBACK"
+export SSL_LIB=`readlink %{_libdir}/libssl.so`
+cd build
+cmake \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+  -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
+  -DCMAKE_SKIP_RPATH=1 \
+  -DPACKAGE_ARCHITECTURE=`uname -m` \
+  -DLIB=%{_lib} \
+   ..
+
+make CFLAGS="-DSSL_LIB='\"$SSL_LIB\"'"
 
 %install
 rm -rf %{buildroot}
+cd build
 make DESTDIR=%{buildroot} install
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/plugins/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/authenticators/*.la
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
-install -m 644 etc/openwsman.conf $RPM_BUILD_ROOT%{_sysconfdir}/openwsman
-install -m 644 etc/ssleay.cnf $RPM_BUILD_ROOT%{_sysconfdir}/openwsman
-install -m 755 etc/init/openwsmand.sh $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openwsmand
-ln -sf %{_sysconfdir}/init.d/openwsmand $RPM_BUILD_ROOT%{_sbindir}/rcopenwsmand
+cd ..
+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
+install -m 644 etc/openwsman_client.conf %{buildroot}/%{_sysconfdir}/openwsman
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+install -p -m 644 %{SOURCE2} %{buildroot}/%{_unitdir}/openwsmand.service
+install -m 644 etc/ssleay.cnf %{buildroot}/%{_sysconfdir}/openwsman
+install -p -m 755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/openwsman
+# install manpage
+mkdir -p %{buildroot}/%{_mandir}/man8/
+cp %SOURCE1 %{buildroot}/%{_mandir}/man8/
+# install missing headers
+install -m 644 include/wsman-xml.h %{buildroot}/%{_includedir}/openwsman
+install -m 644 include/wsman-xml-binding.h %{buildroot}/%{_includedir}/openwsman
+install -m 644 include/wsman-dispatcher.h %{buildroot}/%{_includedir}/openwsman
 
 %clean
 rm -rf %{buildroot}
+
 %post -n libwsman1 -p /sbin/ldconfig
 
 %postun -n libwsman1 -p /sbin/ldconfig
 
 %post server
 /sbin/ldconfig
-chkconfig --add  openwsmand
+if [ $1 -eq 1 ] ; then
+  # Initial installation 
+  /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
 
 %preun server
-chkconfig --del openwsmand
+if [ $1 = 0 ] ; then
+       /bin/systemctl --no-reload disable openwsmand.service > /dev/null 2>&1 || :
+       /bin/systemctl stop openwsmand.service > /dev/null 2>&1 || :
+fi
 
 %postun server
 rm -f /var/log/wsmand.log
+
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ "$1" -ge "1" ] ; then
+     /bin/systemctl try-restart openwsmand.service >/dev/null 2>&1 || :
+fi
 /sbin/ldconfig
 
 %post client -p /sbin/ldconfig
@@ -167,37 +226,37 @@ rm -f /var/log/wsmand.log
 %postun client -p /sbin/ldconfig
 
 %files -n libwsman1
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_libdir}/libwsman.so.*
 %{_libdir}/libwsman_client.so.*
 %{_libdir}/libwsman_curl_client_transport.so.*
 
 %files -n libwsman-devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 %{_libdir}/*.so
 %doc AUTHORS COPYING ChangeLog README
 
 %files python
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{python_sitearch}/*.so
-%{python_sitelib}/*.py
-#%{python_sitelib}/*.pyc
-#%{python_sitelib}/*.pyo
+%{python_sitearch}/*.py
+%{python_sitearch}/*.pyc
+%{python_sitearch}/*.pyo
 %doc AUTHORS COPYING ChangeLog README
 
-%files ruby
-%defattr(-,root,root)
-%{ruby_sitearch}/openwsman.so
-%dir %{ruby_sitelib}/openwsman
-%{ruby_sitelib}/openwsman/openwsman.rb
-%{ruby_sitelib}/openwsman/wsxmlnode.rb
-%doc AUTHORS COPYING ChangeLog README
+#%files ruby
+#%defattr(-,root,root,-)
+#%{ruby_sitearch}/openwsman.so
+#%{ruby_sitearch}/_openwsman.so
+#%dir %{ruby_sitelib}/openwsman
+#%{ruby_sitelib}/openwsman/*.rb
+#%doc AUTHORS COPYING ChangeLog README
 
 %files perl
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{perl_vendorarch}/openwsman.so
 %{perl_vendorlib}/openwsman.pm
 %doc AUTHORS COPYING ChangeLog README
@@ -205,13 +264,14 @@ rm -f /var/log/wsmand.log
 %files server
 # Don't remove *.so files from the server package.
 # the server fails to start without these files.
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{_sysconfdir}/openwsman
 %config(noreplace) %{_sysconfdir}/openwsman/openwsman.conf
 %config(noreplace) %{_sysconfdir}/openwsman/ssleay.cnf
 %attr(0755,root,root) %{_sysconfdir}/openwsman/owsmangencert.sh
+%attr(0755,root,root) %{_sysconfdir}/openwsman/owsmantestcert.sh
 %config(noreplace) %{_sysconfdir}/pam.d/openwsman
-%attr(0755,root,root) %{_sysconfdir}/init.d/openwsmand
+%{_unitdir}/openwsmand.service
 %dir %{_libdir}/openwsman
 %dir %{_libdir}/openwsman/authenticators
 %{_libdir}/openwsman/authenticators/*.so
@@ -220,54 +280,118 @@ rm -f /var/log/wsmand.log
 %{_libdir}/openwsman/plugins/*.so
 %{_libdir}/openwsman/plugins/*.so.*
 %{_sbindir}/openwsmand
-%{_sbindir}/rcopenwsmand
 %{_libdir}/libwsman_server.so.*
+%{_mandir}/man8/*
 %doc AUTHORS COPYING ChangeLog README
 
 %files client
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/libwsman_clientpp.so.*
+%config(noreplace) %{_sysconfdir}/openwsman/openwsman_client.conf
 %doc AUTHORS COPYING ChangeLog README
 
 
 %changelog
-* Tue May 31 2011 Praveen K Paladugu <praveen_paladugu@dell.com> -2.2.0-8
-- Replaced the ruby(abi) dependency with ruby-libs for el4 branch.
+* Mon May 28 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-5
+- Rename service file
 
-* Thu Dec 31 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-7
-- Removed the dependency on libcurl-devel and added curl-devel.
-- remove the hard coding of ruby while determing the sitearch and sitelibs.
+* Wed May 23 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-4
+- Add systemd support
 
-* Mon Dec 28 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-6
-- Changed the random file used for creating an openssl cert
+* Thu Feb 09 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-3
+- Temporarily disable ruby subpackage
 
-* Mon Dec 28 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-5
-- Added a few Build dependencies
+* Thu Jan 26 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-2
+- Remove unnecessary net-tools requirement
+  Resolves: #784787
 
-* Mon Dec 28 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-4
-- Following the upstream packaging, updated the spec file to break the
-- package into server, client, lib components.
+* Wed Jan 11 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-1
+- Update to openwsman-2.2.7
 
-* Tue Nov  3 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-3
-- Changed the python-config script for it to be working on el4
+* Mon Jun 20 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2.2.5-3
+- Perl mass rebuild
 
-* Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-2
-- Increasing the release number to make another tag 
+* Fri Jun 10 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2.2.5-2
+- Perl 5.14 mass rebuild
 
-* Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-1
-- Updated the sources to 2.2.0. Couple of major changes are as follows:
-- Major changes:
-- 	Adapt IANA ports of 5985 (http) and 5986 (https)
-- 	Change the Ruby bindings module name to 'Openwsman'
-- 	Change the Ruby plugin module name to 'Openwsman'
-- 	IPv6 support (A_Venkatachalam@Dell.com)
-- 	preliminary support for wbem intrinsic operations
--           'EnumerateClassNames' and 'GetClass' (kkaempf@suse.de)
--            (needs fixed sblim-sfcc, see www.openwsman.org for details)
-- Added a few more files in %files 
+* Wed Mar 23 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.5-1
+- Update to openwsman-2.2.5
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Dec  9 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.4-2
+- Recompile with -DNO_SSL_CALLBACK
+
+* Tue Nov 16 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.4-1
+- Update to openwsman-2.2.4
+- Add help2man generated manpage for openwsmand binary
+- Add missing openwsman headers to libwsman-devel
+- Add configuration file to openwsman-client
+
+* Wed Sep 29 2010 jkeating - 2.2.3-9
+- Rebuilt for gcc bug 634757
+
+* Mon Sep 13 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.3-8
+- Move initscript to the right place
+- Fix return values from initscript according to guidelines
+
+* Tue Aug 10 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-7
+- Moved the certificate generation from init script. The user will have to 
+-   generate the certificate manually.
+
+* Mon Aug  2 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-6
+- Fixed the version checking of swig and forced all the ruby files to be 
+-   installed into site{lib,arch} dirs 
+
+* 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
+- authors.patch: Moved all the AUTHORS info to AUTHORS file.
+- Corrected the Source tag.
+- Corrected the package dependencies to break cyclic dependencies.
+- Fixed the default attributes.
+- Fixed the preun & postun scripts, to make sure the openwsmand service
+-    is stopped before the package is removed.
+- Added 'condrestart' function to the init script.
+- Had to let the *.so files be part of the openwsman-server becuase
+-    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 
+- 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. 
+- 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.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.1.0-4
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Mon Sep 22 2008 Matt Domsch <Matt_Domsch@dell.com> - 2.1.0-1
 - update to 2.1.0, resolves security issues
 
-* Tue Aug 19 2008  <srinivas_ramanatha@dell.com> - 2.0.0-1
+* Tue Aug 19 2008  <srinivas_ramanatha@dell.com> - 2.0.0-1%{?dist}
 - Modified the spec file to adhere to fedora packaging guidelines.

openwsmand.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Openwsman WS-Management Service
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/openwsmand
+ExecStartPre=/etc/openwsman/owsmantestcert.sh
+PIDFile=/var/run/wsmand.pid
+
+[Install]
+WantedBy=multi-user.target

owsmantestcert.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ ! -f "/etc/openwsman/serverkey.pem" ]; then
+  if [ -f "/etc/ssl/servercerts/servercert.pem" \
+       -a -f "/etc/ssl/servercerts/serverkey.pem" ]; then
+    echo "Using common server certificate /etc/ssl/servercerts/servercert.pem"
+    ln -s /etc/ssl/servercerts/server{cert,key}.pem /etc/openwsman
+    exit 0
+  else
+    echo "FAILED: Starting openwsman server"
+    echo "There is no ssl server key available for openwsman server to use."
+    echo -e "Please generate one with the following script and start the openwsman service again:\n"
+    echo "##################################"
+    echo "/etc/openwsman/owsmangencert.sh"
+    echo "================================="
+    
+    echo "NOTE: The script uses /dev/random device for generating some random bits while generating the server key."
+    echo "      If this takes too long, you can replace the value of \"RANDFILE\" in /etc/openwsman/ssleay.cnf with /dev/urandom. Please understand the implications of replacing the RNADFILE."
+    exit 1
+  fi
+fi

perl-bindings.patch

@@ -1,22 +0,0 @@
-diff -up openwsman-2.2.0/bindings/perl/Makefile.am.org openwsman-2.2.0/bindings/perl/Makefile.am
---- openwsman-2.2.0/bindings/perl/Makefile.am.org	2009-12-10 13:34:55.000000000 -0600
-+++ openwsman-2.2.0/bindings/perl/Makefile.am	2009-12-10 13:35:56.000000000 -0600
-@@ -33,6 +33,7 @@ SWIG_INPUT = ../openwsman.i
- openwsman_la_SOURCES = openwsman_wrap.c \
- 			 ../openwsman.c \
- 			 $(SWIG_INPUT)
-+all-local: openwsman.pm
- 
- openwsman_la_LIBADD = $(LIBS) -lpthread $(CURL_LIBS)
- 
-diff -up openwsman-2.2.0/bindings/perl/Makefile.in.org openwsman-2.2.0/bindings/perl/Makefile.in
---- openwsman-2.2.0/bindings/perl/Makefile.in.org	2009-12-10 13:35:03.000000000 -0600
-+++ openwsman-2.2.0/bindings/perl/Makefile.in	2009-12-10 13:36:18.000000000 -0600
-@@ -289,6 +289,7 @@ SWIG_INPUT = ../openwsman.i
- openwsman_la_SOURCES = openwsman_wrap.c \
- 			 ../openwsman.c \
- 			 $(SWIG_INPUT)
-+all-local: openwsman.pm
- 
- openwsman_la_LIBADD = $(LIBS) -lpthread $(CURL_LIBS)
- openwsman_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)

python-config

@@ -1,57 +0,0 @@
-#!/usr/bin/python2.5
-
-import sys
-import os
-import getopt
-from distutils import sysconfig
-
-valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', 
-              'ldflags', 'help']
-all_opts = ""
-for opt in valid_opts:
-     all_opts = all_opts +'|--'+opt
-
-
-
-def exit_with_usage(code=1):
-    print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0],all_opts)
-    sys.exit(code)
-
-try:
-    opts, args = getopt.getopt(sys.argv[1:], '', valid_opts)
-except getopt.error:
-    exit_with_usage()
-
-if not opts:
-    exit_with_usage()
-
-opt = opts[0][0]
-
-pyver = sysconfig.get_config_var('VERSION')
-getvar = sysconfig.get_config_var
-
-if opt == '--help':
-    exit_with_usage(0)
-
-elif opt == '--prefix':
-    print sysconfig.PREFIX
-
-elif opt == '--exec-prefix':
-    print sysconfig.EXEC_PREFIX
-
-elif opt in ('--includes', '--cflags'):
-    flags = ['-I' + sysconfig.get_python_inc(),
-             '-I' + sysconfig.get_python_inc(plat_specific=True)]
-    if opt == '--cflags':
-        flags.extend(getvar('CFLAGS').split())
-    print ' '.join(flags)
-
-elif opt in ('--libs', '--ldflags'):
-    libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
-    libs.append('-lpython'+pyver)
-    # add the prefix/lib/pythonX.Y/config dir, but only if there is no
-    # shared library in prefix/lib/.
-    if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
-        libs.insert(0, '-L' + getvar('LIBPL'))
-    print ' '.join(libs)
-

sources

@@ -1 +1,2 @@
-62b4eaf752171058bf0036e049ca01d0  openwsman-2.2.0.tar.bz2
+3958e97476aa94c506075e3cd165240d  openwsman-2.2.5.tar.bz2
+c72e3b34e25f393be8fd1ead6b4a5bae  openwsman-2.2.7.tar.bz2