From baa5e86459946d3d5557efd15cada9bdc57ff36e Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Nov 10 2008 12:56:57 +0000
Subject: - Import all gcc-defined macros into SWIG (recommended by Adam Tkac)


---

diff --git a/m2crypto-0.18-gcc_macros.patch b/m2crypto-0.18-gcc_macros.patch
new file mode 100644
index 0000000..1ba2faa
--- /dev/null
+++ b/m2crypto-0.18-gcc_macros.patch
@@ -0,0 +1,11 @@
+diff -up M2Crypto-0.19.1/SWIG/_m2crypto.i.gcc_macros M2Crypto-0.19.1/SWIG/_m2crypto.i
+--- M2Crypto-0.19.1/SWIG/_m2crypto.i.gcc_macros	2008-11-10 13:40:38.000000000 +0100
++++ M2Crypto-0.19.1/SWIG/_m2crypto.i	2008-11-10 13:41:02.000000000 +0100
+@@ -4,6 +4,7 @@
+  * Portions created by Open Source Applications Foundation (OSAF) are
+  * Copyright (C) 2004-2006 OSAF. All Rights Reserved.
+  */
++%import "gcc_macros.h"
+ 
+ %module _m2crypto
+ 
diff --git a/m2crypto.spec b/m2crypto.spec
index 505f382..8d8f989 100644
--- a/m2crypto.spec
+++ b/m2crypto.spec
@@ -6,10 +6,12 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.19.1
-Release: 1
+Release: 2
 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
+# This is only precautionary, it does fix anything - not sent upstream
+Patch1: m2crypto-0.18-gcc_macros.patch
 License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
@@ -24,6 +26,7 @@ This package allows you to call OpenSSL functions from python scripts.
 %prep
 %setup -q -n M2Crypto-%{version}
 %patch0 -p1
+%patch1 -p1 -b .gcc_macros
 
 # Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
 # doesn't follow the #include.
@@ -42,6 +45,8 @@ for i in SWIG/_ec.i SWIG/_evp.i; do
 done
 %endif
 
+gcc -E -dM - < /dev/null | grep -v __STDC__ > SWIG/gcc_macros.h
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
 if pkg-config openssl ; then
@@ -83,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Mon Nov 10 2008 Miloslav Trmač <mitr@redhat.com> - 0.19.1-2
+- Import all gcc-defined macros into SWIG (recommended by Adam Tkac)
+
 * Mon Oct 13 2008 Miloslav Trmač <mitr@redhat.com> - 0.19.1-1
 - Update to m2crypto-0.19.1