[sip] 4.13.1

Rex Dieter rdieter at fedoraproject.org
Fri Dec 23 14:05:47 UTC 2011


commit 035fc30052e5ee6674c56738de6669cc8ebe63dc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Dec 23 08:05:44 2011 -0600

    4.13.1

 .gitignore                |    5 +----
 sip-4.12.4-no_rpath.patch |   30 ------------------------------
 sip-4.13.1-no_rpath.patch |   23 +++++++++++++++++++++++
 sip.spec                  |    7 +++++--
 sources                   |    2 +-
 5 files changed, 30 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 490353d..c67a5b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-/sip-4.12.1.tar.gz
-/sip-4.12.2.tar.gz
-/sip-4.12.3.tar.gz
-/sip-4.12.4.tar.gz
 /sip-4.13.tar.gz
+/sip-4.13.1.tar.gz
diff --git a/sip-4.13.1-no_rpath.patch b/sip-4.13.1-no_rpath.patch
new file mode 100644
index 0000000..4c95ad8
--- /dev/null
+++ b/sip-4.13.1-no_rpath.patch
@@ -0,0 +1,23 @@
+## 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.spec b/sip.spec
index f034829..c39db5d 100644
--- a/sip.spec
+++ b/sip.spec
@@ -9,7 +9,7 @@
 
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
-Version: 4.13
+Version: 4.13.1
 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.12.4-no_rpath.patch
+Patch51: sip-4.13.1-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 Dec 23 2011 Rex Dieter <rdieter at fedoraproject.org> 4.13.1-1
+- 4.13.1
+
 * Wed Oct 26 2011 Rex Dieter <rdieter at fedoraproject.org> 4.13-1
 - 4.13
 
diff --git a/sources b/sources
index af4ea46..625653c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21b4e2cad56e4156df2220143264b8ff  sip-4.13.tar.gz
+3f61fd39d5b0c8fa9e43b59af04de924  sip-4.13.1.tar.gz


More information about the scm-commits mailing list