commit python-sip for openSUSE:Factory
Hello community, here is the log from the commit of package python-sip for openSUSE:Factory checked in at Mon Sep 6 11:48:24 CEST 2010. -------- --- python-sip/python-sip.changes 2010-09-01 10:46:32.000000000 +0200 +++ python-sip/python-sip.changes 2010-09-06 09:52:06.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 6 07:51:48 UTC 2010 - coolo@novell.com + +- fix python linking for factory + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fix-linking26.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sip.spec ++++++ --- /var/tmp/diff_new_pack.8E7wRP/_old 2010-09-06 11:47:55.000000000 +0200 +++ /var/tmp/diff_new_pack.8E7wRP/_new 2010-09-06 11:47:55.000000000 +0200 @@ -24,7 +24,7 @@ Group: Development/Libraries/Python Summary: SIP tool to use python sip bindings Version: 4.11 -Release: 1 +Release: 2 %define rversion %version Url: http://www.riverbankcomputing.com/software/sip/intro BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,6 +33,7 @@ Patch2: fix-linking.diff Patch3: fix-linking25.diff Patch4: build-compare.diff +Patch5: fix-linking26.diff %py_requires %description @@ -41,13 +42,6 @@ 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 @@ 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 ++++++ fix-linking.diff ++++++ --- /var/tmp/diff_new_pack.8E7wRP/_old 2010-09-06 11:47:55.000000000 +0200 +++ /var/tmp/diff_new_pack.8E7wRP/_new 2010-09-06 11:47:55.000000000 +0200 @@ -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 = ++++++ fix-linking26.diff ++++++ --- 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 = ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de