From 2e38ac7fe7ae419bcc1d3a1ff36966814dc5702e Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 16 May 2008 08:28:16 +0000 Subject: [PATCH] - readded swig-arch.patch, will be kept downstream --- swig-arch.patch | 18 ++++++++++++++++++ swig.spec | 12 +++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 swig-arch.patch diff --git a/swig-arch.patch b/swig-arch.patch new file mode 100644 index 0000000..9309bb5 --- /dev/null +++ b/swig-arch.patch @@ -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) { diff --git a/swig.spec b/swig.spec index a8460c9..86275e5 100644 --- a/swig.spec +++ b/swig.spec @@ -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 @@ tool for building user interfaces. %prep %setup -q -n swig-%{version} %patch1 -p1 -b .pylib +%patch2 -p1 -b .arch %build ./autogen.sh @@ -58,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/swig %changelog +* Fri May 16 2008 Adam Tkac 1.3.35-2 +- readded swig-arch.patch, will be kept downstream + * Mon May 05 2008 Adam Tkac 1.3.35-1 - updated to latest upstream release