rpms/swig/devel swig-arch.patch,1.2,1.3 swig.spec,1.38,1.39

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/swig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17074

Modified Files:
	swig.spec 
Added Files:
	swig-arch.patch 
Log Message:
- readded swig-arch.patch, will be kept downstream


swig-arch.patch:

Index: swig-arch.patch
===================================================================
RCS file: swig-arch.patch
diff -N swig-arch.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ swig-arch.patch	16 May 2008 08:28:16 -0000	1.3
@@ -0,0 +1,18 @@
+diff -up swig-1.3.35/Source/Preprocessor/cpp.c.arch swig-1.3.35/Source/Preprocessor/cpp.c
+--- swig-1.3.35/Source/Preprocessor/cpp.c.arch	2008-05-16 10:10:38.000000000 +0200
++++ swig-1.3.35/Source/Preprocessor/cpp.c	2008-05-16 10:15:40.000000000 +0200
+@@ -187,6 +187,14 @@ void Preprocessor_init(void) {
+ 
+   id_scan = NewScanner();;
+ 
++#ifdef __x86_64__
++  Preprocessor_define("__x86_64__", 0);
++#elif defined(__powerpc64__)
++  Preprocessor_define("__powerpc64__", 0);
++#else
++  Preprocessor_define("__i386__", 0);
++#endif
++
+ }
+ 
+ void Preprocessor_delete(void) {


Index: swig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swig/devel/swig.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- swig.spec	5 May 2008 10:40:15 -0000	1.38
+++ swig.spec	16 May 2008 08:28:16 -0000	1.39
@@ -4,12 +4,18 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages.
 Name: swig
 Version: 1.3.35
-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
+
+# XXX This patch will be never accepted by upstream
+# https://sourceforge.net/tracker/?func=detail&atid=101645&aid=1604332&group_id=1645
+# but it is typical distribution patch and should be kept downstream
+Patch2: swig-arch.patch
+
 BuildRoot: %{_tmppath}/swig-root
 BuildRequires: perl, python-devel
 %if %{tcl}
@@ -32,6 +38,7 @@
 %prep
 %setup -q -n swig-%{version}
 %patch1 -p1 -b .pylib
+%patch2 -p1 -b .arch
 
 %build
 ./autogen.sh
@@ -58,6 +65,9 @@
 %{_datadir}/swig
 
 %changelog
+* Fri May 16 2008 Adam Tkac <atkac redhat com> 1.3.35-2
+- readded swig-arch.patch, will be kept downstream
+
 * Mon May 05 2008 Adam Tkac <atkac redhat com> 1.3.35-1
 - updated to latest upstream release