From 6d051586387e885bc7d6a3bc71f7e633efae6ad9b054a975c9090cbb49732eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 16 Aug 2011 12:28:43 +0000 Subject: [PATCH] Accepting request 79001 from home:termim:branches:KDE:Qt Update to 4.12.4 add python3-sip.spec OBS-URL: https://build.opensuse.org/request/show/79001 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=58 --- fix-linking.diff | 11 ----- fix-linking25.diff | 11 ----- fix-linking26.diff | 11 ----- python-sip.changes | 6 +++ python-sip.spec | 18 ++------- python3-sip.changes | 8 ++++ python3-sip.spec | 97 +++++++++++++++++++++++++++++++++++++++++++++ sip-4.12.3.tar.bz2 | 3 -- sip-4.12.4.tar.bz2 | 3 ++ 9 files changed, 117 insertions(+), 51 deletions(-) delete mode 100644 fix-linking.diff delete mode 100644 fix-linking25.diff delete mode 100644 fix-linking26.diff create mode 100644 python3-sip.changes create mode 100644 python3-sip.spec delete mode 100644 sip-4.12.3.tar.bz2 create mode 100644 sip-4.12.4.tar.bz2 diff --git a/fix-linking.diff b/fix-linking.diff deleted file mode 100644 index 630500e..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.7 - 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/fix-linking26.diff b/fix-linking26.diff deleted file mode 100644 index f454f43..0000000 --- a/fix-linking26.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/python-sip.changes b/python-sip.changes index 112cde8..37b7914 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 16 00:07:23 UTC 2011 - termim@gmail.com + +- Update to 4.12.4 + - A bug fix release. + ------------------------------------------------------------------- Mon May 30 15:24:38 CEST 2011 - dmueller@suse.de diff --git a/python-sip.spec b/python-sip.spec index 254776f..8bc118e 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -23,17 +23,14 @@ BuildRequires: c++_compiler python python-devel License: GPLv2+ Group: Development/Libraries/Python Summary: SIP tool to use python sip bindings -Version: 4.12.3 +Version: 4.12.4 Release: 1 %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 -Patch2: fix-linking.diff -Patch3: fix-linking25.diff -Patch4: build-compare.diff -Patch5: fix-linking26.diff +Patch1: build-compare.diff %py_requires %description @@ -62,16 +59,7 @@ own sip bindings. %prep %setup -q -n sip-%{rversion} %patch0 -%if %suse_version >1100 -%if %suse_version <1140 -%patch5 -%else -%patch2 -%endif -%else -%patch3 -%endif -%patch4 +%patch1 %build export CFLAGS="$RPM_OPT_FLAGS" diff --git a/python3-sip.changes b/python3-sip.changes new file mode 100644 index 0000000..50ae20e --- /dev/null +++ b/python3-sip.changes @@ -0,0 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 16 00:07:23 UTC 2011 - termim@gmail.com + +- Update to 4.12.4 + - A bug fix release. +- Adapted python-sip.spec for python3 + + diff --git a/python3-sip.spec b/python3-sip.spec new file mode 100644 index 0000000..21bea14 --- /dev/null +++ b/python3-sip.spec @@ -0,0 +1,97 @@ +# +# spec file for package python3-sip +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: python3-sip +License: GPLv2+ +Group: Development/Libraries/Python +Summary: SIP tool to use python sip bindings +Version: 4.12.4 +Release: 1.0 +%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: build-compare.diff +BuildRequires: c++_compiler +BuildRequires: python3 python3-devel +Requires: python3 python3-base +PreReq: python3 python3-base + +%global py3_incdir %(python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())" 2>/dev/null || echo PYTHON-NOT-FOUND) + + +%description +SIP is a tool that makes it very easy to create Python bindings for C +and C++ libraries. It was originally developed to create PyQt, the +Python bindings for the Qt toolkit, but can be used to create bindings +for any C or C++ library. + +%package devel +License: GPLv2+ +Group: Development/Libraries/Python +Summary: SIP tool to create python bindings +Provides: python3-sip:/usr/bin/sip +Requires: %name = %version +Requires: c++_compiler python3-devel + +%description devel +SIP is a tool that makes it very easy to create Python bindings for C +and C++ libraries. It was originally developed to create PyQt, the +Python bindings for the Qt toolkit, but can be used to create bindings +for any C or C++ library. + +This package contains all the developer tools you need to create your +own sip bindings. + +%prep +%setup -q -n sip-%{rversion} +%patch0 +%patch1 + +%build +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS" +export SUSE_ASNEEDED=0 +python3 configure.py --debug CFLAGS+="$RPM_OPT_FLAGS" CXXFLAGS+="$RPM_OPT_FLAGS" +make %{?jobs:-j %jobs} + +%install +make DESTDIR=$RPM_BUILD_ROOT install +mkdir -p $RPM_BUILD_ROOT/usr/share/sip +sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc README +%{python3_sitearch}/sip.so + +%files devel +%defattr(-,root,root) +%doc NEWS LICENSE doc +/usr/bin/sip +%{py3_incdir}/sip.h +%{python3_sitearch}/sipconfig.py +%{python3_sitearch}/sipdistutils.py +/usr/share/sip + +%changelog diff --git a/sip-4.12.3.tar.bz2 b/sip-4.12.3.tar.bz2 deleted file mode 100644 index 243b18b..0000000 --- a/sip-4.12.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dd67d9b221da3b2203e647737d2b6801bf865477b2ad3983bdde8d46fb25b46 -size 528871 diff --git a/sip-4.12.4.tar.bz2 b/sip-4.12.4.tar.bz2 new file mode 100644 index 0000000..867c35f --- /dev/null +++ b/sip-4.12.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3912a366221649eab38424159cd34659426f8115a976cf2ae74775a3dee4c021 +size 524381