diff --git a/.cvsignore b/.cvsignore index e59f0dc..0571c95 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -swig-1.3.19.tar.gz +swig-1.3.21.tar.gz diff --git a/sources b/sources index c533dcb..267c836 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a733455544426b31868dd87fc162e750 swig-1.3.19.tar.gz +88ff5b99be3eafebb8a6e20f4f986c04 swig-1.3.21.tar.gz diff --git a/swig-1.3.21-destdir.patch b/swig-1.3.21-destdir.patch new file mode 100644 index 0000000..16abb29 --- /dev/null +++ b/swig-1.3.21-destdir.patch @@ -0,0 +1,23 @@ +--- 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.spec b/swig.spec index 7bece89..6094548 100644 --- a/swig.spec +++ b/swig.spec @@ -3,14 +3,14 @@ Summary: Connects C/C++/Objective C to some high-level programming languages. Name: swig -Version: 1.3.19 -Release: 6.1 +Version: 1.3.21 +Release: 1 License: BSD Group: Development/Tools URL: http://swig.sourceforge.net/ Source: http://download.sourceforge.net/swig/swig-%{version}.tar.gz -Patch: swig-1.3.19-lib64.patch Patch1: swig-1.3.19-pylib.patch +Patch2: swig-1.3.21-destdir.patch BuildRoot: %{_tmppath}/swig-root BuildPrereq: perl, python-devel %if %{tcl} @@ -31,8 +31,8 @@ tool for building user interfaces. %prep %setup -q -n SWIG-%{version} -%patch -p1 -b .lib64 %patch1 -p1 -b .pylib +%patch2 -p1 -b .destdir %build ./autogen.sh @@ -42,7 +42,6 @@ make runtime %install rm -rf $RPM_BUILD_ROOT -#mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir},%{_includedir}} make DESTDIR=$RPM_BUILD_ROOT install %clean @@ -53,12 +52,13 @@ rm -rf $RPM_BUILD_ROOT %doc ANNOUNCE CHANGES FUTURE INSTALL LICENSE NEW README TODO %doc Doc/* %{_bindir}/* -%{_libdir}/*.a -%{_libdir}/*.la -%{_libdir}/*.so %{_libdir}/swig1.3 +%{_datadir}/aclocal/swig.m4 %changelog +* Tue May 04 2004 Phil Knirsch +- Update to swig-1.3.21 + * Tue Mar 02 2004 Elliot Lee - rebuilt