Accepting request 92901 from KDE:Qt

Fix the 11.3/11.4 python3-sip build (forwarded request 92833 from dirkmueller)

OBS-URL: https://build.opensuse.org/request/show/92901
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-sip?expand=0&rev=51

python-sip.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Thu Oct 27 16:55:43 UTC 2011 - Sascha.Manns@open-slx.de
+
+- Changelog from the Creators
+  - SIP v4.13 has been released. This is a minor feature release.
+    o added the %DefaultDocstringFormat directive
+    o added the format argument to the %Docstring directive
+    o %ConvertToSubClassCode can now cause a restart of the conversion 
+      process using a different requested type
+    o '*' and '&' are now supported as unary operators in expressions 
+      used in the values of default arguments
+    o the /Transfer/ annotation can now be used with the /Array/ 
+      annotation to prevent the freeing of the temporary array of 
+      pointers. 
+
+-------------------------------------------------------------------
+Wed Oct 26 20:18:57 UTC 2011 - Sascha.Manns@open-slx.de
+
+- Updated to 4.13
+  - last stable release 
+
 -------------------------------------------------------------------
 Mon Aug 29 18:41:49 UTC 2011 - termim@gmail.com
 

python-sip.spec

@@ -23,8 +23,8 @@ BuildRequires:  c++_compiler python python-devel
 License:        GPL-2.0 or GPL-3.0 or SIP
 Group:          Development/Libraries/Python
 Summary:        SIP tool to use python sip bindings
-Version:        4.12.4
+Version:        4.13
-Release:        3
+Release:        0
 %define rversion %version
 Url:            http://www.riverbankcomputing.com/software/sip/intro
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

python3-sip.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Nov 21 10:33:26 UTC 2011 - cgiboudeaux@gmx.com
+
+- Define python3_sitearch (fixes the <12.1 build)
+- Spec cleanup
+
+-------------------------------------------------------------------
+Wed Oct 26 20:19:38 UTC 2011 - Sascha.Manns@open-slx.de
+
+- Update to 4.13
+  - last stable release 
+
 -------------------------------------------------------------------
 Mon Aug 29 18:41:49 UTC 2011 - termim@gmail.com
 

python3-sip.spec

@@ -15,32 +15,33 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           python3-sip
-License:        GPL-2.0 or GPL-3.0 or SIP
+Version:        4.13
-Group:          Development/Libraries/Python
-Summary:        SIP tool to use python sip bindings
-Version:        4.12.4
 Release:        2
-%define rversion %version
+License:        GPL-2.0 or GPL-3.0 or SIP
+Summary:        SIP tool to use python sip bindings
+%define rversion %{version}
 Url:            http://www.riverbankcomputing.com/software/sip/intro
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Group:          Development/Libraries/Python
 Source0:        sip-%{rversion}.tar.bz2
 Patch0:         disable-rpaths.diff
 Patch1:         build-compare.diff
 BuildRequires:  c++_compiler
-BuildRequires:  python3 python3-devel
+BuildRequires:  python3
+BuildRequires:  python3-devel
+Requires(pre):  python3
 Requires:       python3
-PreReq:         python3
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %if 0%{?suse_version} > 1140
+Requires(pre):  python3-base
 Requires:       python3-base
-PreReq:         python3-base
 %endif
 
-%global py3_incdir  %(python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())" 2>/dev/null || echo PYTHON-NOT-FOUND)
+%global py3_incdir  %(python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc(True))" 2>/dev/null || echo PYTHON-NOT-FOUND)
+%global python3_sitearch %(python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(True))" 2>/dev/null || echo PYTHON-NOT-FOUND)
 
 %description
 SIP is a tool that makes it very easy to create Python bindings for C
@@ -50,11 +51,13 @@ for any C or C++ library.
 
 %package devel
 License:        GPL-2.0 or GPL-3.0 or SIP
-Group:          Development/Libraries/Python
 Summary:        SIP tool to create python bindings
+Group:          Development/Libraries/Python
+Requires:       %{name} = %{version}
+Requires:       c++_compiler
+Requires:       python-sip-bin
+Requires:       python3-devel
 Provides:       python3-sip:/usr/bin/sip
-Requires:       %name = %version
-Requires:       c++_compiler python3-devel python-sip-bin
 
 %description devel
 SIP is a tool that makes it very easy to create Python bindings for C
@@ -62,7 +65,7 @@ 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 
+This package contains all the developer tools you need to create your
 own sip bindings.
 
 %prep
@@ -71,21 +74,21 @@ own sip bindings.
 %patch1
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="%{optflags}"
-export CXXFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="%{optflags}"
 export SUSE_ASNEEDED=0
-python3 configure.py --debug CFLAGS+="$RPM_OPT_FLAGS" CXXFLAGS+="$RPM_OPT_FLAGS"
+python3 configure.py --debug CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}"
-make %{?jobs:-j %jobs}
+make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
-mkdir -p $RPM_BUILD_ROOT/usr/share/sip
+mkdir -p %{buildroot}%{_datadir}/sip
 sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README
 # sip executable is provided by python-sip-bin to avoid conflicts
-rm $RPM_BUILD_ROOT/usr/bin/sip
+rm %{buildroot}%{_bindir}/sip
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -98,6 +101,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py3_incdir}/sip.h
 %{python3_sitearch}/sipconfig.py
 %{python3_sitearch}/sipdistutils.py
-/usr/share/sip
+%{_datadir}/sip
 
 %changelog

sip-4.12.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3912a366221649eab38424159cd34659426f8115a976cf2ae74775a3dee4c021
-size 524381

sip-4.13.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77a636f694094494bc67dce5680ce9b70dab14137e2246cbccbe2aca04890f51
+size 531916