From 9b145a4e475f42f88a4ee5a4bf53bfe1431f659270bc1bf5fbd5e1dc6092f3e8 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Mon, 31 Aug 2009 12:57:19 +0000 Subject: [PATCH 1/4] fix plasmoids requiring python-devel to work (part of bnc#535057) OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=19 --- fix-linking.diff | 11 +++++++++++ python-sip.changes | 5 +++++ python-sip.spec | 3 +++ 3 files changed, 19 insertions(+) create mode 100644 fix-linking.diff 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/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..5346bcc 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -31,6 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: sip-%{rversion}.tar.bz2 Patch0: disable-rpaths.diff Patch1: fix-unresolved-external-types.diff +Patch2: fix-linking.diff %py_requires %description @@ -71,10 +72,12 @@ Authors: %setup -q -n sip-%{rversion} %patch0 %patch1 -p1 +%patch2 %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" +export SUSE_ASNEEDED=0 python configure.py make %{?jobs:-j %jobs} From 34a67819a8ca06142e808d6ce28b01180458486e443084678b6123b88cbcb081 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Mon, 31 Aug 2009 16:24:37 +0000 Subject: [PATCH 2/4] fix build on <11.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=20 --- fix-linking25.diff | 11 +++++++++++ python-sip.spec | 5 +++++ ready | 0 3 files changed, 16 insertions(+) create mode 100644 fix-linking25.diff delete mode 100644 ready 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.spec b/python-sip.spec index 5346bcc..208af8f 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -32,6 +32,7 @@ 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 @@ -72,7 +73,11 @@ Authors: %setup -q -n sip-%{rversion} %patch0 %patch1 -p1 +%if %suse_version >1100 %patch2 +%else +%patch3 +%endif %build export CFLAGS="$RPM_OPT_FLAGS" diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From 6a4291f7a40b5908656f67fb13157d20441c27427b25d110f5c7e723e56e5f4b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 31 Aug 2009 19:21:32 +0000 Subject: [PATCH 3/4] checked in OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=21 --- fix-linking.diff | 11 ----------- fix-linking25.diff | 11 ----------- python-sip.changes | 5 ----- python-sip.spec | 8 -------- ready | 0 5 files changed, 35 deletions(-) delete mode 100644 fix-linking.diff delete mode 100644 fix-linking25.diff create mode 100644 ready diff --git a/fix-linking.diff b/fix-linking.diff deleted file mode 100644 index f454f43..0000000 --- a/fix-linking.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index d8aebc7..0000000 --- a/fix-linking25.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 ca8c6bc..a749039 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 208af8f..2af1c03 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -31,8 +31,6 @@ 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 @@ -73,16 +71,10 @@ 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} diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 From 032a151c88dd90d19be527a91714dc96c9af530490d3b521483794205bda0897 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 31 Aug 2009 19:21:34 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/python-sip revision 22.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=c741d7e262bd8153a72c957b2aaed114 --- fix-linking.diff | 11 +++++++++++ fix-linking25.diff | 11 +++++++++++ python-sip.changes | 5 +++++ python-sip.spec | 10 +++++++++- 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 fix-linking.diff create mode 100644 fix-linking25.diff 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}