rpms/m2crypto/devel m2crypto-0.19-no-ec.patch, NONE, 1.1 m2crypto-0.19-shebang.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 m2crypto.spec, 1.44, 1.45 sources, 1.9, 1.10 m2crypto-0.18-proxy.patch, 1.1, NONE m2crypto-0.18.2-inspect.patch, 1.2, NONE m2crypto-0.18.2-proxy-ua.patch, 1.2, NONE

[Miloslav Trmac]

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15525

Modified Files:
	.cvsignore m2crypto.spec sources 
Added Files:
	m2crypto-0.19-no-ec.patch m2crypto-0.19-shebang.patch 
Removed Files:
	m2crypto-0.18-proxy.patch m2crypto-0.18.2-inspect.patch 
	m2crypto-0.18.2-proxy-ua.patch 
Log Message:
* Mon Oct  6 2008 Miloslav Trmač <mitr at redhat.com> - 0.19-1
- Update to m2crypto-0.19
- Fix some rpmlint warnings


m2crypto-0.19-no-ec.patch:

--- NEW FILE m2crypto-0.19-no-ec.patch ---
diff -urN M2Crypto/SWIG/_evp.i M2Crypto-0.19/SWIG/_evp.i
--- M2Crypto/SWIG/_evp.i	2008-10-06 10:49:31.000000000 +0200
+++ M2Crypto-0.19/SWIG/_evp.i	2008-10-06 10:49:45.000000000 +0200
@@ -6,6 +6,8 @@
 Author: Heikki Toivonen
 */
 
+%include <openssl/opensslconf.h>
+
 %{
 #include <assert.h>
 #include <openssl/err.h>
@@ -131,8 +133,10 @@
 extern void EVP_PKEY_free(EVP_PKEY *);
 %rename(pkey_assign) EVP_PKEY_assign;
 extern int EVP_PKEY_assign(EVP_PKEY *, int, char *);
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL && !defined(OPENSSL_NO_EC)
 %rename(pkey_assign_ec) EVP_PKEY_assign_EC_KEY;
 extern int EVP_PKEY_assign_EC_KEY(EVP_PKEY *, EC_KEY *);
+#endif
 %rename(pkey_set1_rsa) EVP_PKEY_set1_RSA;
 extern int EVP_PKEY_set1_RSA(EVP_PKEY *, RSA *);
 %rename(pkey_get1_rsa) EVP_PKEY_get1_RSA;

m2crypto-0.19-shebang.patch:

--- NEW FILE m2crypto-0.19-shebang.patch ---
diff -up M2Crypto-0.19/M2Crypto/Engine.py.shebang M2Crypto-0.19/M2Crypto/Engine.py
--- M2Crypto-0.19/M2Crypto/Engine.py.shebang	2008-10-06 11:15:27.000000000 +0200
+++ M2Crypto-0.19/M2Crypto/Engine.py	2008-10-06 11:15:34.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # vim: sts=4 sw=4 et
 """
 M2Crypto wrapper for OpenSSL ENGINE API.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	26 Oct 2007 15:09:07 -0000	1.9
+++ .cvsignore	6 Oct 2008 09:57:52 -0000	1.10
@@ -1 +1 @@
-m2crypto-0.18.2.tar.gz
+M2Crypto-0.19.tar.gz


Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- m2crypto.spec	18 Sep 2008 14:42:25 -0000	1.44
+++ m2crypto.spec	6 Oct 2008 09:57:52 -0000	1.45
@@ -5,13 +5,15 @@
 
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
-Version: 0.18.2
-Release: 8%{?dist}
-Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
+Version: 0.19
+Release: 1
+Source0: http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz
+# https://bugzilla.osafoundation.org/show_bug.cgi?id=2341
 Patch0: m2crypto-0.18-timeouts.patch
-Patch1: m2crypto-0.18-proxy.patch
-Patch2: m2crypto-0.18.2-proxy-ua.patch
-Patch3: m2crypto-0.18.2-inspect.patch
+# https://bugzilla.osafoundation.org/show_bug.cgi?id=12396
+Patch1: m2crypto-0.19-no-ec.patch
+# https://bugzilla.osafoundation.org/show_bug.cgi?id=12397
+Patch2: m2crypto-0.19-shebang.patch
 License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
@@ -24,11 +26,10 @@
 This package allows you to call OpenSSL functions from python scripts.
 
 %prep
-%setup -q
+%setup -q -n M2Crypto-%{version}
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
 # doesn't follow the #include.
@@ -38,11 +39,13 @@
 %ifarch %{ix86}
 basearch=i386
 %endif
-%ifarch sparcv9                                                                                                                          
-basearch=sparc                                                                                                                           
-%endif 
+%ifarch sparcv9
+basearch=sparc
+%endif
 %ifarch %{multilib_arches}
-sed -i -e "s/opensslconf/opensslconf-${basearch}/" SWIG/_ec.i
+for i in SWIG/_ec.i SWIG/_evp.i; do
+	sed -i -e "s/opensslconf/opensslconf-${basearch}/" "$i"
+done
 %endif
 
 %build
@@ -73,6 +76,8 @@
 
 # Windows-only
 rm demo/Zope/starts.bat
+# Fix up documentation permssions
+find demo tests -type f -perm -111 -print0 | xargs -0 chmod a-x
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,6 +89,10 @@
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Mon Oct  6 2008 Miloslav Trmač <mitr at redhat.com> - 0.19-1
+- Update to m2crypto-0.19
+- Fix some rpmlint warnings
+
 * Thu Sep 18 2008 Dennis Gilmore <dennis at ausil.us> - 0.18.2-8
 - enable sparc arches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	26 Oct 2007 15:09:07 -0000	1.9
+++ sources	6 Oct 2008 09:57:52 -0000	1.10
@@ -1 +1 @@
-445dce53fcfc7ec8f6fd31f54da8a067  m2crypto-0.18.2.tar.gz
+f9fa8f38121be614d4d70e1884fcf260  M2Crypto-0.19.tar.gz


--- m2crypto-0.18-proxy.patch DELETED ---


--- m2crypto-0.18.2-inspect.patch DELETED ---


--- m2crypto-0.18.2-proxy-ua.patch DELETED ---