Accepting request 147139 from KDE:Qt

Remove openSUSE 11.4 spec file workarounds (forwarded request 142451 from TheBlackCat) (forwarded request 142452 from TheBlackCat)

OBS-URL: https://build.opensuse.org/request/show/147139
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-sip?expand=0&rev=60
This commit is contained in:
Stephan Kulow 2013-01-07 16:37:37 +00:00 committed by Git OBS Bridge
commit c5680d28c4
2 changed files with 6 additions and 11 deletions

View File

@ -6,6 +6,11 @@ Sun Dec 9 13:44:20 UTC 2012 - lbeltrame@kde.org
- sip.voidptr() will now accept any object that implements the buffer
protocol.
-------------------------------------------------------------------
Thu Nov 22 14:18:55 UTC 2012 - toddrme2178@gmail.com
- Removed openSUSE 11.4 spec file workarounds
-------------------------------------------------------------------
Mon Oct 29 09:55:09 UTC 2012 - dmueller@suse.com

View File

@ -15,12 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%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)
%global py3_ver %(python3 -c "import sys; v=sys.version_info[:2]; print('%%d.%%d'%%v)" 2>/dev/null || echo PYTHON-NOT-FOUND)
%global py3_abi %(python3-config --abiflags)
%define rversion %{version}
%define python_sip_api 9.1
@ -37,15 +32,10 @@ Patch0: disable-rpaths.diff
# PATCH-FIX-OPENSUSE build-compare.diff cmorve69@yahoo.es -- Fix build-compare
Patch1: build-compare.diff
BuildRequires: c++_compiler
BuildRequires: python3
BuildRequires: python3-devel
Provides: python3-sip(api) = %python_sip_api
Requires(pre): python3
Requires: python3
%if 0%{?suse_version} > 1140
Requires(pre): python3-base
Requires: python3-base
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -81,7 +71,7 @@ own sip bindings.
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
# Link against libpython (fixes bnc#756282 and bnc#721280)
python3 configure.py --debug CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LIBS+="-lpython%{py3_ver}%{py3_abi}"
python3 configure.py --debug CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LIBS+="-lpython%{py3_ver}%{py3_abiflags}"
make %{?_smp_mflags}
sip_major=$(grep "define SIP_API_MAJOR_NR" siplib/sip.h.in | awk '{print $3}')