rpms/swig/FC-6 swig-arch.patch,NONE,1.1 swig.spec,1.30,1.31

[fedora-cvs-commits at redhat.com]

Author: atkac

Update of /cvs/dist/rpms/swig/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv25560/swig/FC-6

Modified Files:
	swig.spec 
Added Files:
	swig-arch.patch 
Log Message:
swig can now determine architecture correctly (#211095)


swig-arch.patch:
 cpp.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE swig-arch.patch ---
--- Source/Preprocessor/cpp.c.arch	2006-03-06 23:50:59.000000000 +0100
+++ Source/Preprocessor/cpp.c	2006-11-07 08:26:56.000000000 +0100
@@ -184,7 +184,11 @@
   included_files = NewHash();
 
   id_scan = NewSwigScanner();;
-
+  #ifdef __x86_64__
+    Preprocessor_define("__x86_64__", 0);
+  #elif defined __i386__
+    Preprocessor_define("__i386__", 0);
+  #endif
 }
 
 void Preprocessor_delete(void) {



Index: swig.spec
===================================================================
RCS file: /cvs/dist/rpms/swig/FC-6/swig.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- swig.spec	28 Aug 2006 09:51:10 -0000	1.30
+++ swig.spec	7 Nov 2006 08:11:13 -0000	1.31
@@ -4,12 +4,13 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages.
 Name: swig
 Version: 1.3.29
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://swig.sourceforge.net/
 Source: http://download.sourceforge.net/swig/swig-%{version}.tar.gz
 Patch1: swig-1.3.23-pylib.patch
+Patch2: swig-arch.patch
 BuildRoot: %{_tmppath}/swig-root
 BuildPrereq: perl, python-devel
 %if %{tcl}
@@ -32,6 +33,7 @@
 %prep
 %setup -q -n swig-%{version}
 %patch1 -p1 -b .pylib
+%patch2 -p0 -b .arch
 
 %build
 ./autogen.sh
@@ -58,6 +60,10 @@
 %{_datadir}/swig
 
 %changelog
+* Tue Nov 07 2006 Adam Tkac <atkac at redhat.com> 1.3.29-2
+- swig can determine architecture now (#211095)
+
+
 * Mon Aug 28 2006 Jitka Kudrnacova <jkudrnac at redhat.com> -1.3.29-1
 -rebuilt