diff --git a/fix-linking.diff b/fix-linking.diff new file mode 100644 index 0000000..f454f43 --- /dev/null +++ b/fix-linking.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/fix-linking25.diff b/fix-linking25.diff new file mode 100644 index 0000000..d8aebc7 --- /dev/null +++ b/fix-linking25.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.5 + 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 a749039..ca8c6bc 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 31 12:55:45 UTC 2009 - beineri@opensuse.org + +- fix plasmoids requiring python-devel to work (part of bnc#535057) + ------------------------------------------------------------------- Wed Aug 05 00:46:55 CEST 2009 - hpj@urpla.net diff --git a/python-sip.spec b/python-sip.spec index 2af1c03..5547b1d 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -24,13 +24,15 @@ License: GPL v2 or later Group: Development/Libraries/Python Summary: SIP tool to use python sip bindings Version: 4.8.2 -Release: 2 +Release: 3 %define rversion %version Url: http://www.riverbankcomputing.com/software/sip/intro BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: sip-%{rversion}.tar.bz2 Patch0: disable-rpaths.diff Patch1: fix-unresolved-external-types.diff +Patch2: fix-linking.diff +Patch3: fix-linking25.diff %py_requires %description @@ -71,10 +73,16 @@ Authors: %setup -q -n sip-%{rversion} %patch0 %patch1 -p1 +%if %suse_version >1100 +%patch2 +%else +%patch3 +%endif %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" +export SUSE_ASNEEDED=0 python configure.py make %{?jobs:-j %jobs}