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