[python26-m2crypto/el5/master: 24/78] - Update to m2crypto-0.16

[gholms]

commit 79c3b0bf667ef5b3a4275fcff72b889bbe982797
Author: Miloslav Trmac <mitr at fedoraproject.org>
Date:   Wed Jul 5 23:36:12 2006 +0000

    - Update to m2crypto-0.16

 .cvsignore    |    2 +-
 m2crypto.spec |   26 +++++++++++++++++---------
 sources       |    2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index d6d4995..911988b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-m2crypto-0.15.tar.bz2
+m2crypto-0.16.tar.gz
diff --git a/m2crypto.spec b/m2crypto.spec
index 8e0a4c0..5527948 100644
--- a/m2crypto.spec
+++ b/m2crypto.spec
@@ -2,12 +2,9 @@
 
 Summary: Support for using OpenSSL in python scripts.
 Name: m2crypto
-Version: 0.15
-Release: 4
-# http://svn.osafoundation.org/m2crypto/tags/0.15
-Source0: m2crypto-%{version}.tar.bz2
-Patch0: m2crypto-0.13-SSLServer.patch
-Patch1: m2crypto-0.15-Connection.patch
+Version: 0.16
+Release: 1
+Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
 License: BSDish
 Group: System Environment/Libraries
 URL: http://sandbox.rulemaker.net/ngps/m2
@@ -22,8 +19,16 @@ This package allows you to call OpenSSL functions from python scripts.
 
 %prep
 %setup -q
-%patch0 -p0 -b .SSLServer
-%patch1 -p1 -b .Connection
+
+# Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
+# doesn't follow the #include.
+
+# Determine which arch opensslconf.h is going to try to #include.
+basearch=%{_arch}
+%ifarch %{ix86}
+basearch=i386
+%endif
+sed -i -e "s/opensslconf/opensslconf-${basearch}/" SWIG/_ec.i
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
@@ -50,10 +55,13 @@ python%{pythonver} setup.py install --root=$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc BUGS CHANGES LIC* README README.Developers demo demo2004 tests
+%doc CHANGES LICENCE README demo tests
 %{_libdir}/python%{pythonver}/site-packages/M2Crypto
 
 %changelog
+* Thu Jul  6 2006 Miloslav Trmac <mitr at redhat.com> - 0.16-1
+- Update to m2crypto-0.16
+
 * Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 0.15-4
 - Fix SSL.Connection.accept (#188742)
 
diff --git a/sources b/sources
index 7312f16..4541898 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-befaf54d86eaf13f7591d630f28a10ee  m2crypto-0.15.tar.bz2
+6fc06583a2be56fc2a46872a0540d78e  m2crypto-0.16.tar.gz