- updated to 1.3.36

- finally dropped swig-arch.patch
- temporary workaround rpm bug #470811
This commit is contained in:
Adam Tkac 2008-11-10 13:11:01 +00:00
parent 2e38ac7fe7
commit 5bc0f0a928
4 changed files with 11 additions and 28 deletions

View File

@ -1 +1 @@
swig-1.3.35.tar.gz swig-1.3.36.tar.gz

View File

@ -1 +1 @@
9c2ca2332ebcdab55aa98518111d7cc9 swig-1.3.35.tar.gz 8f30aa4130b62404099bbcba1bf429b1 swig-1.3.36.tar.gz

View File

@ -1,18 +0,0 @@
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) {

View File

@ -3,19 +3,14 @@
Summary: Connects C/C++/Objective C to some high-level programming languages. Summary: Connects C/C++/Objective C to some high-level programming languages.
Name: swig Name: swig
Version: 1.3.35 Version: 1.3.36
Release: 2%{?dist} Release: 1%{?dist}
License: BSD License: BSD
Group: Development/Tools Group: Development/Tools
URL: http://swig.sourceforge.net/ URL: http://swig.sourceforge.net/
Source: http://download.sourceforge.net/swig/swig-%{version}.tar.gz Source: http://download.sourceforge.net/swig/swig-%{version}.tar.gz
Patch1: swig-1.3.23-pylib.patch 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 BuildRoot: %{_tmppath}/swig-root
BuildRequires: perl, python-devel BuildRequires: perl, python-devel
%if %{tcl} %if %{tcl}
@ -38,7 +33,6 @@ tool for building user interfaces.
%prep %prep
%setup -q -n swig-%{version} %setup -q -n swig-%{version}
%patch1 -p1 -b .pylib %patch1 -p1 -b .pylib
%patch2 -p1 -b .arch
%build %build
./autogen.sh ./autogen.sh
@ -48,6 +42,8 @@ make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
# XXX workaround for https://bugzilla.redhat.com/show_bug.cgi?id=470811
rm -f Doc/Manual/Perl5.html
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
%clean %clean
@ -65,6 +61,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/swig %{_datadir}/swig
%changelog %changelog
* Mon Nov 10 2008 Adam Tkac <atkac redhat com> 1.3.36-1
- updated to 1.3.36
- finally dropped swig-arch.patch
- temporary workaround rpm bug #470811
* Fri May 16 2008 Adam Tkac <atkac redhat com> 1.3.35-2 * Fri May 16 2008 Adam Tkac <atkac redhat com> 1.3.35-2
- readded swig-arch.patch, will be kept downstream - readded swig-arch.patch, will be kept downstream