diff --git a/.gitignore b/.gitignore index 41925e7..828d3a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /sip-4.13.tar.gz /sip-4.13.2.tar.gz +/sip-4.13.3.tar.gz diff --git a/sip-4.13.1-no_rpath.patch b/sip-4.13.1-no_rpath.patch deleted file mode 100644 index 4c95ad8..0000000 --- a/sip-4.13.1-no_rpath.patch +++ /dev/null @@ -1,23 +0,0 @@ -## HACK indeed, let's not rpath the world, mm-kay? -- rex - -diff -up sip-4.13.1/siputils.py.no_rpath sip-4.13.1/siputils.py ---- sip-4.13.1/siputils.py.no_rpath 2011-12-23 07:52:21.613411754 -0600 -+++ sip-4.13.1/siputils.py 2011-12-23 08:02:47.884582287 -0600 -@@ -430,7 +430,7 @@ class Makefile: - if l_dir in ("", ".", ".."): - continue - -- rpaths.append(l) -+ #rpaths.append(l) - - if self._python: - incdir.append(self.config.py_inc_dir) -@@ -599,7 +599,7 @@ class Makefile: - # Handle library directories. - libdir_qt = self.optional_list("LIBDIR_QT") - libdir.extend(libdir_qt) -- rpaths.extend(libdir_qt) -+ #rpaths.extend(libdir_qt) - - if self.config.qt_version >= 0x040000: - # Try and read QT_LIBINFIX from qconfig.pri. diff --git a/sip-4.13.3-no_rpath.patch b/sip-4.13.3-no_rpath.patch new file mode 100644 index 0000000..b5d55ba --- /dev/null +++ b/sip-4.13.3-no_rpath.patch @@ -0,0 +1,23 @@ +## HACK indeed, let's not rpath the world, mm-kay? -- rex + +diff -up sip-4.13.3/siputils.py.no_rpath sip-4.13.3/siputils.py +--- sip-4.13.3/siputils.py.no_rpath 2012-06-22 06:54:54.311308656 -0500 ++++ sip-4.13.3/siputils.py 2012-06-22 06:55:58.998499957 -0500 +@@ -434,7 +434,7 @@ class Makefile: + if l_dir in ("", ".", ".."): + continue + +- rpaths.append(l) ++ #rpaths.append(l) + + if self._python: + incdir.append(self.config.py_inc_dir) +@@ -603,7 +603,7 @@ class Makefile: + # Handle library directories. + libdir_qt = self.optional_list("LIBDIR_QT") + libdir.extend(libdir_qt) +- rpaths.extend(libdir_qt) ++ #rpaths.extend(libdir_qt) + + if qt_version >= 0x040000: + # Try and read QT_LIBINFIX from qconfig.pri. diff --git a/sip.spec b/sip.spec index 3132d0e..c5e5f3f 100644 --- a/sip.spec +++ b/sip.spec @@ -9,7 +9,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.13.2 +Version: 4.13.3 Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -22,7 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # make install should not strip (by default), kills -debuginfo Patch50: sip-4.12.1-no_strip.patch # try not to rpath the world -Patch51: sip-4.13.1-no_rpath.patch +Patch51: sip-4.13.3-no_rpath.patch # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip @@ -186,6 +186,9 @@ rm -rf %{buildroot} %changelog +* Fri Jun 22 2012 Rex Dieter 4.13.3-1 +- 4.13.3 + * Sat Feb 11 2012 Rex Dieter 4.13.2-1 - 4.13.2 diff --git a/sources b/sources index 702b850..054af96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a12ea8e8a09b879ed2b3817e30fbc84 sip-4.13.2.tar.gz +76192829cc42ec558db46e4f9e1d8ba9 sip-4.13.3.tar.gz