Changed the dependency to ruby-libs

#2781)

openwsman.rpmlintrc

@@ -1,2 +0,0 @@
-addFilter("devel-file-in-non-devel-package .*/usr/lib.*/openwsman/.*/.*")
-addFilter("openwsman-client.*shlib-policy-name-error.*")

openwsman.spec

@@ -1,47 +1,27 @@
-#
-# 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()")}
+%{!?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)")}
 %{!?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
-BuildRequires:  swig
-BuildRequires:  libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
-BuildRequires:  python python-devel ruby ruby-devel perl
-BuildRequires:  perl-devel pkgconfig openssl-devel
-BuildRequires:  libtool
-Requires:       net-tools
-Version:        2.2.0
-Release:        3%{?dist}
-Url:            http://www.openwsman.org/
+Name:          openwsman
+Version:       2.2.0
+Release:        8%{?dist}
 License:        BSD
-Group:          Applications/System
-Summary:        Opensource Implementation of WS-Management
-Source:         %{name}-%{version}.tar.bz2
-Source1:        %{name}.rpmlintrc
-Patch0:         %{name}-pam-auth.patch
-Patch1:         %{name}-initscript.patch
+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:         %{name}-randfile.patch
+Patch3:         openwsman-randfile.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
@@ -52,14 +32,6 @@ 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.
 
-
-
-Authors:
---------
-    Anas Nashif <anas.nashif@intel.com>
-    Vadim Revyakin <vadim.revyakin@intel.com>
-    Denis Sadykov <denis.sadykov@intel.com>
-
 %package -n libwsman1
 License:        BSD
 Group:          System Environment/Libraries
@@ -70,15 +42,6 @@ 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
 Group:          Development/Libraries
@@ -89,18 +52,11 @@ Requires:       libwsman1 = %{version}
 Requires:       %{name}-server = %{version}
 Requires:       %{name}-client = %{version}
 Requires:       sblim-sfcc-devel libxml2-devel pam-devel
-Requires:       libcurl-devel
+Requires:       curl-devel
 
 %description -n libwsman-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
 Group:          System Environment/Libraries
@@ -109,14 +65,6 @@ Summary:        Openwsman Client libraries
 %description client
 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
@@ -131,13 +79,6 @@ Summary:        Openwsman Server and service libraries
 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
 Group:          Development/Libraries
@@ -148,32 +89,16 @@ Requires:       python
 This package provides Python 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 ruby
 License:        BSD
 Group:          Development/Libraries
 Requires:       ruby
-Requires:       ruby(abi) = 1.8
+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.
 
-
-
-Authors:
---------
-    Anas Nashif <anas.nashif@intel.com>
-    Vadim Revyakin <vadim.revyakin@intel.com>
-    Denis Sadykov <denis.sadykov@intel.com>
-
 %package perl
 License:        BSD
 Group:          Development/Libraries
@@ -185,40 +110,32 @@ 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
+%setup -q 
 %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
-# Removing executable permissions on .c and .h files to fix rpmlint warnings. 
-chmod -x src/cpp/WsmanClient.h
-chmod -x src/lib/wsman-filter.c
-chmod -x include/wsman-filter.h
-%configure \
-    --disable-more-warnings \
-    --disable-static \
-    --enable-python \
-    --enable-ruby \
-    --enable-perl \
-    --enable-ipv6
-#make clean
+chmod a-x src/lib/*.[ch]
+chmod a-x src/cpp/*.[ch]
+chmod a-x include/*.[ch]
 
+# 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}
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=$RPM_BUILD_ROOT install
+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
@@ -229,8 +146,7 @@ install -m 755 etc/init/openwsmand.sh $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openw
 ln -sf %{_sysconfdir}/init.d/openwsmand $RPM_BUILD_ROOT%{_sbindir}/rcopenwsmand
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 %post -n libwsman1 -p /sbin/ldconfig
 
 %postun -n libwsman1 -p /sbin/ldconfig
@@ -315,37 +231,43 @@ rm -f /var/log/wsmand.log
 
 
 %changelog
-* Wed Dec 16 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-3
-- Changed the random file used by openssl to generate a certificate while
-- starting the openwsman-server service
+* 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.
 
-* Wed Dec  9 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-2
-- Re-wrote the spec file to break the openwmsman pkg into lib, client
-- and server components following the upstream spec 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.
+
+* 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
+
+* Mon Dec 28 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-5
+- Added a few Build dependencies
+
+* 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.
+
+* 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
+
+* Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-2
+- Increasing the release number to make another tag 
 
 * 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)
+- 	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)
-  
-
-* 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
+- Added a few more files in %files 
 
 * 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%{?dist}
+* Tue Aug 19 2008  <srinivas_ramanatha@dell.com> - 2.0.0-1
 - Modified the spec file to adhere to fedora packaging guidelines.

python-config

@@ -0,0 +1,57 @@
+#!/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)
+