rpms/m2crypto/devel m2crypto-0.13-python24.patch, 1.1, 1.2 m2crypto.spec, 1.11, 1.12 m2crypto-0.09-norc5.patch, 1.1, NONE m2crypto-setup.patch, 1.1, NONE

Tue May 31 21:04:29 UTC 2005

Author: mitr

Update of /cvs/dist/rpms/m2crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2918

Modified Files:
	m2crypto-0.13-python24.patch m2crypto.spec 
Removed Files:
	m2crypto-0.09-norc5.patch m2crypto-setup.patch 
Log Message:
* Tue May 31 2005 Miloslav Trmac <mitr at redhat.com> - 0.13-3
- Fix invalid Python version comparisons in M2Crypto.httpslib (#156979)
- Don't ship obsolete xmlrpclib.py.patch
- Clean up the build process a bit


m2crypto-0.13-python24.patch:
 M2Crypto/httpslib.py            |    6 +++---
 SWIG-1.3.23/Tools/setup.py.tmpl |    2 +-
 setup.py                        |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Index: m2crypto-0.13-python24.patch
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/m2crypto-0.13-python24.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- m2crypto-0.13-python24.patch	23 Nov 2004 12:47:20 -0000	1.1
+++ m2crypto-0.13-python24.patch	31 May 2005 21:04:27 -0000	1.2
@@ -1,5 +1,5 @@
---- m2crypto-0.13/setup.py.py24	2004-11-23 13:39:12.679521018 +0100
-+++ m2crypto-0.13/setup.py	2004-11-23 13:39:24.473860981 +0100
+--- m2crypto-0.13/setup.py.py24	2004-03-28 13:06:59.000000000 +0200
++++ m2crypto-0.13/setup.py	2005-05-31 22:53:50.000000000 +0200
 @@ -14,7 +14,7 @@
  
  # This copy of swig_sources is from Python 2.2.
@@ -9,8 +9,37 @@
  
      """Walk the list of source files in 'sources', looking for SWIG
      interface (.i) files.  Run SWIG on all that are found, and
+--- m2crypto-0.13/M2Crypto/httpslib.py.py24	2005-05-31 22:54:15.000000000 +0200
++++ m2crypto-0.13/M2Crypto/httpslib.py	2005-05-31 22:54:24.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ if sys.version[0] == '2':
+     
+-    if sys.version[:3] != '2.0':
++    if sys.version_info[:2] > (2, 0):
+         # In 2.1 and above, httplib exports "HTTP" only.
+         from httplib import HTTPConnection, HTTPS_PORT
+ 
+@@ -22,7 +22,7 @@
+     
+         default_port = HTTPS_PORT
+     
+-        if (sys.version[:3] == '2.2' and sys.version_info[2] > 1) or (sys.version[:3] == '2.3'):
++        if sys.version_info[:3] > (2, 2, 1):
+         
+             # 2.2.2 and above have the 'strict' param.
+             def __init__(self, host, port=None, strict=None, **ssl):
+@@ -98,7 +98,7 @@
+         
+         _connection_class = HTTPSConnection
+     
+-        if (sys.version[:3] == '2.2' and sys.version_info[2] > 1) or (sys.version[:3] == '2.3'):
++        if sys.version_info[:3] > (2, 2, 1):
+             # 2.2.2 and above have the 'strict' param.            
+             def __init__(self, host='', port=None, strict=None, **ssl):
+                 HTTP.__init__(self, host, port, strict)
 --- m2crypto-0.13/SWIG-1.3.23/Tools/setup.py.tmpl.py24	2002-11-30 23:01:22.000000000 +0100
-+++ m2crypto-0.13/SWIG-1.3.23/Tools/setup.py.tmpl	2004-11-23 13:38:17.698226777 +0100
++++ m2crypto-0.13/SWIG-1.3.23/Tools/setup.py.tmpl	2005-05-31 22:53:50.000000000 +0200
 @@ -46,7 +46,7 @@
          self.swig_inc = 'SWIG'
          self.swig_shadow = None        


Index: m2crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- m2crypto.spec	16 Mar 2005 23:04:15 -0000	1.11
+++ m2crypto.spec	31 May 2005 21:04:27 -0000	1.12
@@ -1,11 +1,11 @@
-%define pythonver 2.4
+%{expand: %%define pythonver %(python -c 'import sys;print(sys.version[0:3])')}
 %define pymainver %{nil}
 %define swigver 1.3.23
 
 Summary: Support for using OpenSSL in python scripts.
 Name: m2crypto
 Version: 0.13
-Release: 2
+Release: 3
 Source0: http://sandbox.rulemaker.net/ngps/Dist/m2crypto-%{version}.zip
 Source1: http://unc.dl.sourceforge.net/sourceforge/swig/swig-%{swigver}.tar.gz
 Patch0: http://sandbox.rulemaker.net/ngps/Dist/0.13p1.patch
@@ -28,14 +28,11 @@
 # Create a directory to hold the local SWIG binary.
 mkdir swigroot
 
-# Distutils currently adds ./SWIG to the include path, but we have ./swig.
-ln -s SWIG swig 
-
 %patch0 -p0 -b .pl1
 %patch1 -p1 -b .py24
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -DMS_CALLBACK=" ; export CFLAGS
+CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`" ; export CFLAGS
 	LDFLAGS="$LDFLAGS`pkg-config --libs-only-L openssl`" ; export LDFLAGS
@@ -64,27 +61,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-CFLAGS="$RPM_OPT_FLAGS -DMS_CALLBACK=" ; export CFLAGS
+CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`" ; export CFLAGS
 	LDFLAGS="$LDFLAGS`pkg-config --libs-only-L openssl`" ; export LDFLAGS
 fi
 
 python%{pythonver} setup.py install --root=$RPM_BUILD_ROOT
-python%{pythonver} \
-	%{_libdir}/python%pythonver/compileall.py \
-	-d %{_libdir}/python%pythonver/site-packages \
-	$RPM_BUILD_ROOT%{_libdir}/python%pythonver/site-packages
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc BUGS CHANGES LIC* README README.Developers demo tests patches
+%doc BUGS CHANGES LIC* README README.Developers demo tests
 %{_libdir}/python%{pythonver}/site-packages/M2Crypto
 
 %changelog
+* Tue May 31 2005 Miloslav Trmac <mitr at redhat.com> - 0.13-3
+- Fix invalid Python version comparisons in M2Crypto.httpslib (#156979)
+- Don't ship obsolete xmlrpclib.py.patch
+- Clean up the build process a bit
+
 * Wed Mar 16 2005 Nalin Dahyabhai <nalin at redhat.com> 0.13-2
 - rebuild
 


--- m2crypto-0.09-norc5.patch DELETED ---


--- m2crypto-setup.patch DELETED ---


