Made a few changes to support python-config test on RHEL5.

.cvsignore

@@ -1 +1 @@
-openwsman-2.1.0.tar.bz2
+openwsman-2.2.0.tar.bz2

branch

@@ -0,0 +1 @@
+EL-5

import.log

@@ -1 +1 @@
-openwsman-2_1_0-1_fc9:HEAD:openwsman-2.1.0-1.fc9.src.rpm:1225537021
+openwsman-2_1_0-1_fc9:EL-5:openwsman-2.1.0-1.fc9.src.rpm:1225535651

openwsman.spec

@@ -1,12 +1,14 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:          openwsman
-Version:       2.1.0
-Release:        4%{?dist}
+Version:       2.2.0
+Release:        2%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source2:        python-config
 Patch0:         %{name}-initscript.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
 Group:          System Environment/Daemons
@@ -52,8 +54,10 @@ Openwsman ruby bindings
 
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
+cp -p %{SOURCE2} %{_builddir}/%{name}-%{version}
+sed -i -e 's|#!/usr/bin/python2.5|#!%{__python}|' %{_builddir}/%{name}-%{version}/python-config
 
 %build
 chmod a-x src/lib/*.[ch]
@@ -62,7 +66,7 @@ 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 --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings
+%configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings PATH=$PATH:.
 make %{?_smp_flags}
 
 %install
@@ -95,6 +99,8 @@ rm -rf %{buildroot}
 %dir /etc/openwsman
 %config(noreplace) /etc/openwsman/openwsman.conf
 %config(noreplace) /etc/openwsman/ssleay.cnf
+%{_libdir}/ruby/site_ruby/1.8/openwsman/
+%config(noreplace) %{_sysconfdir}/pam.d/openwsman
 %doc COPYING README
 
 %files devel
@@ -109,7 +115,7 @@ rm -rf %{buildroot}
 %files python
 %defattr(-,root,root)
 %{python_sitelib}/pywsman.py
-%{python_sitelib}/*.so
+%{python_sitearch}/*.so
 %doc COPYING
 
 %files -n ruby-%{name}
@@ -135,6 +141,14 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-2
+- check for python-configure in configure.ac fails because python-config
+- is not part of python-2.4 which is currently available in RHEL
+- So added a script python-config to the sources, and allowed configure to 
+- search in BUILD/opewsman-2.2.0 for python-configure script.
+* 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
 

python-config

@@ -0,0 +1,53 @@
+#!/usr/bin/python2.5
+
+import sys
+import os
+import getopt
+from distutils import sysconfig
+
+valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', 
+              'ldflags', 'help']
+
+def exit_with_usage(code=1):
+    print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0], 
+                                            '|'.join('--'+opt for opt in valid_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 @@
-25a135bea7c1653f66b2428c4b252d3a  openwsman-2.1.0.tar.bz2
+62b4eaf752171058bf0036e049ca01d0  openwsman-2.2.0.tar.bz2