rpms/m2crypto/devel m2crypto-0.18-gcc_macros.patch, NONE, 1.1 m2crypto.spec, 1.46, 1.47

[Miloslav Trmac]

Author: mitr

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

Modified Files:
	m2crypto.spec 
Added Files:
	m2crypto-0.18-gcc_macros.patch 
Log Message:
* Mon Nov 10 2008 Miloslav Trmač <mitr at redhat.com> - 0.19.1-2
- Import all gcc-defined macros into SWIG (recommended by Adam Tkac)


m2crypto-0.18-gcc_macros.patch:

--- NEW FILE m2crypto-0.18-gcc_macros.patch ---
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
 


Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- m2crypto.spec	13 Oct 2008 13:17:09 -0000	1.46
+++ m2crypto.spec	10 Nov 2008 12:56:57 -0000	1.47
@@ -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 @@
 %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 @@
 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 @@
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Mon Nov 10 2008 Miloslav Trmač <mitr at redhat.com> - 0.19.1-2
+- Import all gcc-defined macros into SWIG (recommended by Adam Tkac)
+
 * Mon Oct 13 2008 Miloslav Trmač <mitr at redhat.com> - 0.19.1-1
 - Update to m2crypto-0.19.1