Updated the spec file to break the pkg in server, client, lib components.

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: openwsman
+# $Id: Makefile,v 1.1 2008/10/13 10:50:29 huzaifas Exp $
+NAME := openwsman
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

import.log

@@ -0,0 +1 @@
+openwsman-2_1_0-1_fc9:HEAD:openwsman-2.1.0-1.fc9.src.rpm:1225537021

openwsman-authors.patch

@@ -1,14 +0,0 @@
-diff -up openwsman-2.2.3/AUTHORS.diff openwsman-2.2.3/AUTHORS
---- openwsman-2.2.3/AUTHORS.diff	2010-04-20 10:42:40.156797595 -0500
-+++ openwsman-2.2.3/AUTHORS	2010-04-20 10:43:10.440803220 -0500
-@@ -13,5 +13,10 @@ Contributions and Patches by:
- 	Viktor Mihajlovski, IBM
- 	Klaus Kaempf, Novell
- 
-+AUTHORS from Spec file:
-+    Anas Nashif <anas.nashif@intel.com>
-+    Vadim Revyakin <vadim.revyakin@intel.com>
-+    Denis Sadykov <denis.sadykov@intel.com>
-+
- 
- If you think you name should be here and I forgot it, please let me know.

openwsman-initscript.patch

@@ -1,14 +1,12 @@
-diff -up ./etc/init/openwsmand.sh.in.old ./etc/init/openwsmand.sh.in
---- ./etc/init/openwsmand.sh.in.old	2010-08-04 16:43:40.212100948 -0500
-+++ ./etc/init/openwsmand.sh.in	2010-08-04 17:26:20.013849220 -0500
-@@ -4,15 +4,15 @@
+diff -up openwsman-2.2.3/etc/init/openwsmand.sh.in.orig openwsman-2.2.3/etc/init/openwsmand.sh.in
+--- openwsman-2.2.3/etc/init/openwsmand.sh.in.orig	2010-01-21 11:12:34.000000000 +0100
++++ openwsman-2.2.3/etc/init/openwsmand.sh.in	2010-03-02 14:29:31.618984202 +0100
+@@ -4,15 +4,13 @@
  # 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
@@ -20,93 +18,12 @@ diff -up ./etc/init/openwsmand.sh.in.old ./etc/init/openwsmand.sh.in
  # description: Openwsman Daemon
  # processname: openwsmand
  
-@@ -56,20 +56,16 @@ start()
- 	echo "Using common server certificate /etc/ssl/servercerts/servercert.pem"
- 	ln -s /etc/ssl/servercerts/server{cert,key}.pem @SYSCONFDIR@
-       else
--        echo "Generating Openwsman server public certificate and private key"
--	FQDN=`hostname --fqdn`
--	if [ "x${FQDN}" = "x" ]; then
--	  FQDN=localhost.localdomain
--	fi
+@@ -61,7 +59,7 @@ start()
+ 	if [ "x${FQDN}" = "x" ]; then
+ 	  FQDN=localhost.localdomain
+ 	fi
 -cat << EOF | sh @SYSCONFDIR@/owsmangencert.sh > /dev/null 2>&1
----
--SomeState
--SomeCity
--SomeOrganization
--SomeOrganizationalUnit
--${FQDN}
--root@${FQDN}
--EOF
-+	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 @SYSCONFDIR@/ssleay.cnf with /dev/urandom."
-+		
-       fi
-     fi
- 
-@@ -145,6 +141,10 @@ case "$1" in
-     fi
-     ;;
- 
-+   condrestart)
-+      [ -e $lockfile ] && restart
-+    ;;
-+
-     *)
-     echo "Usage: $0 {restart|start|stop|reload|force-reload|status}"
- esac
-diff -up ./etc/owsmangencert.sh.in.old ./etc/owsmangencert.sh.in
---- ./etc/owsmangencert.sh.in.old	2010-08-04 17:14:31.241100874 -0500
-+++ ./etc/owsmangencert.sh.in	2010-08-04 17:21:02.944850958 -0500
-@@ -1,7 +1,5 @@
- #!/bin/sh
- 
--#!/bin/sh -e
--
- CERTFILE=@SYSCONFDIR@/servercert.pem
- KEYFILE=@SYSCONFDIR@/serverkey.pem
- CNFFILE=@SYSCONFDIR@/ssleay.cnf
-@@ -15,19 +13,33 @@ if [ "$1" = "--force" ]; then
-   shift
- fi
- 
-+FQDN=`hostname --fqdn`
-+        if [ "x${FQDN}" = "x" ]; then
-+          FQDN=localhost.localdomain
-+        fi
- echo
- echo creating selfsingned certificate
- echo "replace it with one signed by a certification authority (CA)"
- echo
--echo enter your ServerName at the Common Name prompt
-+#echo enter your ServerName at the Common Name prompt
- echo
- 
- # use special .cnf, because with normal one no valid selfsigned
- # certificate is created
- 
--export RANDFILE=/dev/random
--openssl req -days 365 $@ -config $CNFFILE \
-+#export RANDFILE=/dev/random
-+cat <<EOF  |openssl req -days 365 $@ -config $CNFFILE \
-   -new -x509 -nodes -out $CERTFILE \
-   -keyout $KEYFILE
-+--
-+SomeState
-+SomeCity
-+SomeOrganization
-+SomeOrganizationalUnit
-+${FQDN}
-+root@${FQDN}
-+EOF
-+
-+ 
- chmod 600 $KEYFILE
- 
++cat << EOF | sh @libexecdir@/openwsman/owsmangencert.sh > /dev/null 2>&1
+ --
+ SomeState
+ SomeCity

openwsman.spec

@@ -1,6 +1,20 @@
 #
-# spec file for package openwsman (Version 2.2.3)
+# spec file for package openwsman (Version 2.2.0)
 #
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
 # norootforbuild
 
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
@@ -16,15 +30,14 @@ BuildRequires:  perl-devel pkgconfig openssl-devel
 BuildRequires:  libtool
 Requires:       net-tools
 Version:        2.2.3
-Release:        3%{?dist}
+Release:        2%{?dist}
 Url:            http://www.openwsman.org/
 License:        BSD
 Group:          Applications/System
 Summary:        Opensource Implementation of WS-Management
-Source:         http://downloads.sourceforge.net/project/openwsman/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.bz2
 Patch0:         %{name}-initscript.patch
 Patch1:         %{name}-randfile.patch
-Patch2:         %{name}-authors.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
 
 %description
@@ -38,6 +51,11 @@ all system management aspects.
 
 
 
+Authors:
+--------
+    Anas Nashif <anas.nashif@intel.com>
+    Vadim Revyakin <vadim.revyakin@intel.com>
+    Denis Sadykov <denis.sadykov@intel.com>
 
 %package -n libwsman1
 License:        BSD
@@ -45,12 +63,18 @@ Group:          System Environment/Libraries
 Summary:        Opensource Implementation of WS-Management
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
+Requires:       %{name}-client
 
 %description -n libwsman1
 Openwsman library for packages dependent on openwsman
 
 
 
+Authors:
+--------
+    Anas Nashif <anas.nashif@intel.com>
+    Vadim Revyakin <vadim.revyakin@intel.com>
+    Denis Sadykov <denis.sadykov@intel.com>
 
 %package -n libwsman-devel
 License:        BSD
@@ -68,6 +92,11 @@ Requires:       libcurl-devel
 Development files for openwsman
 
 
+Authors:
+--------
+    Anas Nashif <anas.nashif@intel.com>
+    Vadim Revyakin <vadim.revyakin@intel.com>
+    Denis Sadykov <denis.sadykov@intel.com>
 
 %package client
 License:        BSD
@@ -79,11 +108,17 @@ Openwsman Client libraries
 
 
 
+Authors:
+--------
+    Anas Nashif <anas.nashif@intel.com>
+    Vadim Revyakin <vadim.revyakin@intel.com>
+    Denis Sadykov <denis.sadykov@intel.com>
 
 %package server
 License:        BSD
 Group:          System Environment/Daemons
 Requires:       net-tools
+Requires:       openwsman-client
 Requires(post):       chkconfig
 Requires(preun):      chkconfig
 Requires(postun):     initscripts
@@ -94,6 +129,11 @@ Openwsman Server and service libraries
 
 
 
+Authors:
+--------
+    Anas Nashif <anas.nashif@intel.com>
+    Vadim Revyakin <vadim.revyakin@intel.com>
+    Denis Sadykov <denis.sadykov@intel.com>
 
 %package python
 License:        BSD
@@ -107,6 +147,11 @@ API.
 
 
 
+Authors:
+--------
+    Anas Nashif <anas.nashif@intel.com>
+    Vadim Revyakin <vadim.revyakin@intel.com>
+    Denis Sadykov <denis.sadykov@intel.com>
 
 %package ruby
 License:        BSD
@@ -120,6 +165,11 @@ This package provides Ruby bindings to access the openwsman client API.
 
 
 
+Authors:
+--------
+    Anas Nashif <anas.nashif@intel.com>
+    Vadim Revyakin <vadim.revyakin@intel.com>
+    Denis Sadykov <denis.sadykov@intel.com>
 
 %package perl
 License:        BSD
@@ -132,11 +182,16 @@ This package provides Perl bindings to access the openwsman client API.
 
 
 
+Authors:
+--------
+    Anas Nashif <anas.nashif@intel.com>
+    Vadim Revyakin <vadim.revyakin@intel.com>
+    Denis Sadykov <denis.sadykov@intel.com>
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 sh autoconfiscate.sh
@@ -158,18 +213,18 @@ make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags}
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
-rm -f %{buildroot}/%{_libdir}/*.la
-rm -f %{buildroot}/%{_libdir}/openwsman/plugins/*.la
-rm -f %{buildroot}/%{_libdir}/openwsman/authenticators/*.la
-mkdir -p %{buildroot}/%{_sysconfdir}/init.d
-install -m 644 etc/openwsman.conf %{buildroot}/%{_sysconfdir}/openwsman
-install -m 644 etc/ssleay.cnf %{buildroot}/%{_sysconfdir}/openwsman
-install -m 755 etc/init/openwsmand.sh %{buildroot}/%{_sysconfdir}/init.d/openwsmand
-ln -sf %{_sysconfdir}/init.d/openwsmand %{buildroot}/%{_sbindir}/rcopenwsmand
+make DESTDIR=$RPM_BUILD_ROOT 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
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post -n libwsman1 -p /sbin/ldconfig
 
@@ -180,16 +235,10 @@ rm -rf %{buildroot}
 chkconfig --add  openwsmand
 
 %preun server
-if [ $1 = "0" ] ; then
-       /sbin/service %{name}d stop >/dev/null 2>&1
-       /sbin/chkconfig --del openwsmand
-fi
+chkconfig --del openwsmand
 
 %postun server
 rm -f /var/log/wsmand.log
-if [ "$1" -ge "1" ] ; then
-     /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
-fi
 /sbin/ldconfig
 
 %post client -p /sbin/ldconfig
@@ -197,21 +246,21 @@ fi
 %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
@@ -219,7 +268,7 @@ fi
 %doc AUTHORS COPYING ChangeLog README
 
 %files ruby
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{ruby_sitearch}/openwsman.so
 %dir %{ruby_sitelib}/openwsman
 %{ruby_sitelib}/openwsman/openwsman.rb
@@ -227,7 +276,7 @@ fi
 %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
@@ -235,7 +284,7 @@ fi
 %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
@@ -255,38 +304,26 @@ fi
 %doc AUTHORS COPYING ChangeLog README
 
 %files client
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{_libdir}/libwsman_clientpp.so.*
 %doc AUTHORS COPYING ChangeLog README
 
 
 %changelog
-* 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.
-
-* 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.
-- 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.
-
-
-* 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.
+* 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.
+- 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.
@@ -305,4 +342,3 @@ fi
 
 * Tue Aug 19 2008  <srinivas_ramanatha@dell.com> - 2.0.0-1%{?dist}
 - Modified the spec file to adhere to fedora packaging guidelines.
-