Accepting request 47210 from home:coolo:branches:openSUSE:Factory
OBS-URL: https://build.opensuse.org/request/show/47210 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=43
This commit is contained in:
committed by
Git OBS Bridge
parent
3e59cb2832
commit
b9a0af67e8
@@ -5,7 +5,7 @@
|
|||||||
QMAKE_LFLAGS_RELEASE =
|
QMAKE_LFLAGS_RELEASE =
|
||||||
QMAKE_LFLAGS_DEBUG =
|
QMAKE_LFLAGS_DEBUG =
|
||||||
-QMAKE_LFLAGS_SHLIB = -shared
|
-QMAKE_LFLAGS_SHLIB = -shared
|
||||||
+QMAKE_LFLAGS_SHLIB = -shared -lpython2.6
|
+QMAKE_LFLAGS_SHLIB = -shared -lpython2.7
|
||||||
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
|
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
|
||||||
QMAKE_LFLAGS_SONAME = -Wl,-soname,
|
QMAKE_LFLAGS_SONAME = -Wl,-soname,
|
||||||
QMAKE_LFLAGS_THREAD =
|
QMAKE_LFLAGS_THREAD =
|
||||||
|
11
fix-linking26.diff
Normal file
11
fix-linking26.diff
Normal file
@@ -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 =
|
@@ -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
|
Wed Sep 1 10:42:55 CEST 2010 - dmueller@suse.de
|
||||||
|
|
||||||
|
@@ -33,6 +33,7 @@ Patch0: disable-rpaths.diff
|
|||||||
Patch2: fix-linking.diff
|
Patch2: fix-linking.diff
|
||||||
Patch3: fix-linking25.diff
|
Patch3: fix-linking25.diff
|
||||||
Patch4: build-compare.diff
|
Patch4: build-compare.diff
|
||||||
|
Patch5: fix-linking26.diff
|
||||||
%py_requires
|
%py_requires
|
||||||
|
|
||||||
%description
|
%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
|
Python bindings for the Qt toolkit, but can be used to create bindings
|
||||||
for any C or C++ library.
|
for any C or C++ library.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Riverbank Computing Limited
|
|
||||||
|
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Development/Libraries/Python
|
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
|
This package contains all the developer tools you need to create your
|
||||||
own sip bindings.
|
own sip bindings.
|
||||||
|
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Riverbank Computing Limited
|
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n sip-%{rversion}
|
%setup -q -n sip-%{rversion}
|
||||||
%patch0
|
%patch0
|
||||||
%if %suse_version >1100
|
%if %suse_version >1100
|
||||||
|
%if %suse_version <1130
|
||||||
|
%patch5
|
||||||
|
%else
|
||||||
%patch2
|
%patch2
|
||||||
|
%endif
|
||||||
%else
|
%else
|
||||||
%patch3
|
%patch3
|
||||||
%endif
|
%endif
|
||||||
|
Reference in New Issue
Block a user