diff --git a/fix-linking.diff b/fix-linking.diff index f454f43..630500e 100644 --- a/fix-linking.diff +++ b/fix-linking.diff @@ -5,7 +5,7 @@ QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -shared -+QMAKE_LFLAGS_SHLIB = -shared -lpython2.6 ++QMAKE_LFLAGS_SHLIB = -shared -lpython2.7 QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = diff --git a/fix-linking26.diff b/fix-linking26.diff new file mode 100644 index 0000000..f454f43 --- /dev/null +++ b/fix-linking26.diff @@ -0,0 +1,11 @@ +--- specs/linux-g++ 2009/08/31 11:59:37 1.1 ++++ specs/linux-g++ 2009/08/31 12:00:19 +@@ -53,7 +53,7 @@ + QMAKE_LFLAGS = + QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = +-QMAKE_LFLAGS_SHLIB = -shared ++QMAKE_LFLAGS_SHLIB = -shared -lpython2.6 + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = diff --git a/python-sip.changes b/python-sip.changes index 72a8552..aeec8b0 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 6 07:51:48 UTC 2010 - coolo@novell.com + +- fix python linking for factory + ------------------------------------------------------------------- Wed Sep 1 10:42:55 CEST 2010 - dmueller@suse.de diff --git a/python-sip.spec b/python-sip.spec index 1d31018..bec31a9 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -33,6 +33,7 @@ Patch0: disable-rpaths.diff Patch2: fix-linking.diff Patch3: fix-linking25.diff Patch4: build-compare.diff +Patch5: fix-linking26.diff %py_requires %description @@ -41,13 +42,6 @@ and C++ libraries. It was originally developed to create PyQt, the Python bindings for the Qt toolkit, but can be used to create bindings for any C or C++ library. - - -Authors: --------- - Riverbank Computing Limited - - %package devel License: GPLv2+ Group: Development/Libraries/Python @@ -65,17 +59,15 @@ for any C or C++ library. This package contains all the developer tools you need to create your own sip bindings. - -Authors: --------- - Riverbank Computing Limited - - %prep %setup -q -n sip-%{rversion} %patch0 %if %suse_version >1100 +%if %suse_version <1130 +%patch5 +%else %patch2 +%endif %else %patch3 %endif