diff --git a/swig-1.3.21-destdir.patch b/swig-1.3.21-destdir.patch deleted file mode 100644 index 16abb29..0000000 --- a/swig-1.3.21-destdir.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- SWIG-1.3.21/Makefile.in.destdir 2004-05-04 15:03:07.651571157 +0200 -+++ SWIG-1.3.21/Makefile.in 2004-05-04 15:03:58.278335334 +0200 -@@ -365,9 +365,9 @@ - - install-m4: - @echo "Installing M4 macros" -- @$(MKINSTDIRS) $(M4_INSTALL_DIR) -+ @$(MKINSTDIRS) $(DESTDIR)$(M4_INSTALL_DIR) - @echo "Installing $(M4_INSTALL_DIR)/swig.m4" -- @$(INSTALL_DATA) $(M4_SOURCE_DIR)/swig.m4 $(M4_INSTALL_DIR)/swig.m4 -+ @$(INSTALL_DATA) $(M4_SOURCE_DIR)/swig.m4 $(DESTDIR)$(M4_INSTALL_DIR)/swig.m4 - - - ##################################################################### -@@ -390,7 +390,7 @@ - - uninstall-m4: - @echo "Uninstalling $(M4_INSTALL_DIR)/swig.m4" -- rm -f $(M4_INSTALL_DIR)/swig.m4; -+ rm -f $(DESTDIR)$(M4_INSTALL_DIR)/swig.m4; - - ############################################################################ - # DIST and other maintenance diff --git a/swig-1.3.21-ldflags.patch b/swig-1.3.21-ldflags.patch deleted file mode 100644 index 6781e36..0000000 --- a/swig-1.3.21-ldflags.patch +++ /dev/null @@ -1,34 +0,0 @@ - -Prevent the -ldflags output from including -L/usr/lib, since this will break -e.g. the Subversion build will then pick up system libraries rather than -local ones. - ---- SWIG-1.3.21/configure.in.ldflags 2004-09-30 15:26:03.000000000 +0100 -+++ SWIG-1.3.21/configure.in 2004-09-30 15:28:49.000000000 +0100 -@@ -16,16 +16,16 @@ - #define SWIG_LANG "-tcl" - - /* Values returned by SWIG when invoked with the -ldflags option */ --#define SWIG_GUILE_RUNTIME "-L" LIBDIR " -lswigguile" RELEASE_SUFFIX --#define SWIG_GUILESCM_RUNTIME "-L" LIBDIR " -lswigguilescm" RELEASE_SUFFIX --#define SWIG_MZSCHEME_RUNTIME "-L" LIBDIR " -lswigmz" RELEASE_SUFFIX --#define SWIG_PERL_RUNTIME "-L" LIBDIR " -lswigpl" RELEASE_SUFFIX --#define SWIG_PIKE_RUNTIME "-L" LIBDIR " -lswigpike" RELEASE_SUFFIX --#define SWIG_PHP_RUNTIME "-L" LIBDIR " -lswigphp4" RELEASE_SUFFIX --#define SWIG_PYTHON_RUNTIME "-L" LIBDIR " -lswigpy" RELEASE_SUFFIX --#define SWIG_RUBY_RUNTIME "-L" LIBDIR " -lswigrb" RELEASE_SUFFIX --#define SWIG_TCL_RUNTIME "-L" LIBDIR " -lswigtcl" RELEASE_SUFFIX --#define SWIG_CHICKEN_RUNTIME "-L" LIBDIR " -lswigchicken" RELEASE_SUFFIX -+#define SWIG_GUILE_RUNTIME "-lswigguile" RELEASE_SUFFIX -+#define SWIG_GUILESCM_RUNTIME "-lswigguilescm" RELEASE_SUFFIX -+#define SWIG_MZSCHEME_RUNTIME "-lswigmz" RELEASE_SUFFIX -+#define SWIG_PERL_RUNTIME "-lswigpl" RELEASE_SUFFIX -+#define SWIG_PIKE_RUNTIME "-lswigpike" RELEASE_SUFFIX -+#define SWIG_PHP_RUNTIME "-lswigphp4" RELEASE_SUFFIX -+#define SWIG_PYTHON_RUNTIME "-lswigpy" RELEASE_SUFFIX -+#define SWIG_RUBY_RUNTIME "-lswigrb" RELEASE_SUFFIX -+#define SWIG_TCL_RUNTIME "-lswigtcl" RELEASE_SUFFIX -+#define SWIG_CHICKEN_RUNTIME "-lswigchicken" RELEASE_SUFFIX - ]) - - dnl Checks for programs. diff --git a/swig-arch.patch b/swig-arch.patch deleted file mode 100644 index 37e6a35..0000000 --- a/swig-arch.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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) { - diff --git a/swig.spec b/swig.spec index df69497..78bbf84 100644 --- a/swig.spec +++ b/swig.spec @@ -3,14 +3,13 @@ Summary: Connects C/C++/Objective C to some high-level programming languages. Name: swig -Version: 1.3.31 -Release: 1%{?dist} +Version: 1.3.33 +Release: 0.1%{?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} @@ -33,7 +32,6 @@ tool for building user interfaces. %prep %setup -q -n swig-%{version} %patch1 -p1 -b .pylib -%patch2 -p0 -b .arch %build ./autogen.sh @@ -60,6 +58,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/swig %changelog +* Thu Nov 29 2007 Adam Tkac 1.3.33-1 +- 1.3.33 +- removed swig-arch.patch because upstream will never accept + it ("swig is not low-level") + * Wed Aug 22 2007 Adam Tkac 1.31.1-1 - rebuild (BuildID feature) - BuildRequires gawk