[sip] try not to rpath the world (#737236)

[Rex Dieter]

commit 3243244429a3dfce3023c3c68441e2d2d8444357
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Sep 14 13:56:08 2011 -0500

    try not to rpath the world (#737236)

 sip-4.12.4-no_rpath.patch |   30 ++++++++++++++++++++++++++++++
 sip.spec                  |    8 +++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/sip-4.12.4-no_rpath.patch b/sip-4.12.4-no_rpath.patch
new file mode 100644
index 0000000..485fec9
--- /dev/null
+++ b/sip-4.12.4-no_rpath.patch
@@ -0,0 +1,30 @@
+diff -up sip-4.12.4/siputils.py.no_rpath sip-4.12.4/siputils.py
+--- sip-4.12.4/siputils.py.no_rpath	2011-09-14 13:47:04.430121782 -0500
++++ sip-4.12.4/siputils.py	2011-09-14 13:49:58.173949684 -0500
+@@ -418,11 +418,12 @@ class Makefile:
+ 
+         rpaths = _UniqueList()
+ 
+-        for l in self.extra_lib_dirs:
+-            # Ignore relative directories.  This is really a hack to handle
+-            # SIP v3 inter-module linking.
+-            if os.path.dirname(l) not in ("", ".", ".."):
+-                rpaths.append(l)
++        ## HACK indeed, let's not rpath the world, mm-kay?  -- rex 
++        #for l in self.extra_lib_dirs:
++            ## Ignore relative directories.  This is really a hack to handle
++            ## SIP v3 inter-module linking.
++            #if os.path.dirname(l) not in ("", ".", ".."):
++                #rpaths.append(l)
+ 
+         if self._python:
+             incdir.append(self.config.py_inc_dir)
+@@ -591,7 +592,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 9e06068..f09a88c 100644
--- a/sip.spec
+++ b/sip.spec
@@ -10,7 +10,7 @@
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.12.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 or GPLv3
 Group: Development/Tools
 Url: http://www.riverbankcomputing.com/software/sip/intro 
@@ -20,6 +20,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## upstreamable patches
 # 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
 
 # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines
 Source1: macros.sip
@@ -104,6 +106,7 @@ classes library.
 %setup -q -n %{name}-%{version}%{?snap:-snapshot-%{snap}}
 
 %patch50 -p1 -b .no_strip
+%patch51 -p1 -b .no_rpath
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -182,6 +185,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 14 2011 Rex Dieter <rdieter at fedoraproject.org> 4.12.4-2
+- try not to rpath the world (#737236)
+
 * Wed Aug 10 2011 Rex Dieter <rdieter at fedoraproject.org> 4.12.4-1
 - 4.12.4