pool/python-sip
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 115249 from home:adra:branches:KDE:Qt

Browse Source 
Fix for bnc#756282 and bnc#721280

OBS-URL: https://build.opensuse.org/request/show/115249
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=74
This commit is contained in:
Ismail Dönmez 2012-04-24 20:22:11 +00:00 committed by Git OBS Bridge
parent 02d14805e6
commit 130872ef1f
4 changed files with 71 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python-sip.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 10 20:38:21 UTC 2012 - asterios.dramis@gmail.com
- Link against libpython. Fixes bnc#756282 and bnc#721280.
- Remove SUSE_ASNEEDED=0 from spec file.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 23 09:39:46 UTC 2012 - cfarrell@suse.com Fri Mar 23 09:39:46 UTC 2012 - cfarrell@suse.com

59
python-sip.spec
View File

@ -15,21 +15,25 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%define rversion %{version}
Name: python-sip Name: python-sip
BuildRequires: c++_compiler Version: 4.13.2
BuildRequires: python Release: 0
BuildRequires: python-devel
Summary: SIP tool to use python sip bindings Summary: SIP tool to use python sip bindings
License: GPL-2.0 or GPL-3.0 or SUSE-SIP License: GPL-2.0 or GPL-3.0 or SUSE-SIP
Group: Development/Libraries/Python Group: Development/Libraries/Python
Version: 4.13.2
Release: 0
%define rversion %version
Url: http://www.riverbankcomputing.com/software/sip/intro Url: http://www.riverbankcomputing.com/software/sip/intro
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://www.riverbankcomputing.com/static/Downloads/sip4/sip-%{rversion}.tar.gz Source0: http://www.riverbankcomputing.com/static/Downloads/sip4/sip-%{rversion}.tar.gz
# PATCH-FIX-OPENSUSE disable-rpaths.diff -- Disable rpaths
Patch0: disable-rpaths.diff Patch0: disable-rpaths.diff
# PATCH-FIX-OPENSUSE build-compare.diff cmorve69@yahoo.es -- Fix build-compare
Patch1: build-compare.diff Patch1: build-compare.diff
BuildRequires: c++_compiler
BuildRequires: python
BuildRequires: python-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires %py_requires
%description %description
@ -41,8 +45,10 @@ for any C or C++ library.
%package devel %package devel
Summary: SIP tool to create python bindings Summary: SIP tool to create python bindings
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: %name = %version Requires: %{name} = %{version}
Requires: c++_compiler python-devel python-sip-bin Requires: c++_compiler
Requires: python-devel
Requires: python-sip-bin
%description devel %description devel
SIP is a tool that makes it very easy to create Python bindings for C SIP is a tool that makes it very easy to create Python bindings for C
@ -53,7 +59,6 @@ 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.
%package bin %package bin
Summary: SIP tool to create python bindings Summary: SIP tool to create python bindings
Group: Development/Libraries/Python Group: Development/Libraries/Python
@ -65,7 +70,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 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.
This package contains the sip executable This package contains the sip executable.
%prep %prep
%setup -q -n sip-%{rversion} %setup -q -n sip-%{rversion}
@ -73,35 +78,35 @@ This package contains the sip executable
%patch1 %patch1
%build %build
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="%{optflags}"
export CXXFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="%{optflags}"
export SUSE_ASNEEDED=0 # Link against libpython (fixes bnc#756282 and bnc#721280)
python configure.py --debug CFLAGS+="$RPM_OPT_FLAGS" CXXFLAGS+="$RPM_OPT_FLAGS" python configure.py --debug CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LIBS+="-lpython%{py_ver}"
make %{?jobs:-j %jobs} make %{?_smp_mflags}
%install %install
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=%{buildroot} install
mkdir -p $RPM_BUILD_ROOT/usr/share/sip
mkdir -p %{buildroot}%{_datadir}/sip
# Point to the correct location for the documentation files
sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README
%clean
rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root,-)
%doc README %doc README
%{py_sitedir}/sip.so %{py_sitedir}/sip.so
%files bin %files bin
%defattr(-,root,root) %defattr(-,root,root,-)
/usr/bin/sip %{_bindir}/sip
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root,-)
%doc NEWS LICENSE doc %doc NEWS LICENSE* doc/
%{py_incdir}/sip.h %{py_incdir}/sip.h
%{py_sitedir}/sipconfig.py %{py_sitedir}/sipconfig.py
%{py_sitedir}/sipdistutils.py %{py_sitedir}/sipdistutils.py
/usr/share/sip %{_datadir}/sip/
%changelog %changelog

9
python3-sip.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Apr 11 13:40:14 UTC 2012 - asterios.dramis@gmail.com
- Link against libpython. Fixes bnc#756282 and bnc#721280.
- license update: GPL-2.0 or GPL-3.0 or SUSE-SIP
Use SUSE- proprietary extension until SIP license is accepted upstream at
spdx.org
- Remove SUSE_ASNEEDED=0 from spec file.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 21 10:33:26 UTC 2011 - cgiboudeaux@gmx.com Mon Nov 21 10:33:26 UTC 2011 - cgiboudeaux@gmx.com

40
python3-sip.spec
View File

@ -15,31 +15,36 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # 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}
Name: python3-sip Name: python3-sip
Version: 4.13.2 Version: 4.13.2
Release: 0 Release: 0
Summary: SIP tool to use python sip bindings Summary: SIP tool to use python sip bindings
License: GPL-2.0 or GPL-3.0 or SIP License: GPL-2.0 or GPL-3.0 or SUSE-SIP
Group: Development/Libraries/Python Group: Development/Libraries/Python
%define rversion %{version}
Url: http://www.riverbankcomputing.com/software/sip/intro Url: http://www.riverbankcomputing.com/software/sip/intro
Source0: http://www.riverbankcomputing.com/static/Downloads/sip4/sip-%{rversion}.tar.gz Source0: http://www.riverbankcomputing.com/static/Downloads/sip4/sip-%{rversion}.tar.gz
# PATCH-FIX-OPENSUSE disable-rpaths.diff -- Disable rpaths
Patch0: disable-rpaths.diff Patch0: disable-rpaths.diff
# PATCH-FIX-OPENSUSE build-compare.diff cmorve69@yahoo.es -- Fix build-compare
Patch1: build-compare.diff Patch1: build-compare.diff
BuildRequires: c++_compiler BuildRequires: c++_compiler
BuildRequires: python3 BuildRequires: python3
BuildRequires: python3-devel BuildRequires: python3-devel
Requires(pre): python3 Requires(pre): python3
Requires: python3 Requires: python3
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1140 %if 0%{?suse_version} > 1140
Requires(pre): python3-base Requires(pre): python3-base
Requires: python3-base Requires: python3-base
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%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 %description
SIP is a tool that makes it very easy to create Python bindings for C SIP is a tool that makes it very easy to create Python bindings for C
@ -73,31 +78,32 @@ own sip bindings.
%build %build
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}" export CXXFLAGS="%{optflags}"
export SUSE_ASNEEDED=0 # Link against libpython (fixes bnc#756282 and bnc#721280)
python3 configure.py --debug CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" python3 configure.py --debug CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LIBS+="-lpython%{py3_ver}%{py3_abi}"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%make_install %{make_install}
mkdir -p %{buildroot}%{_datadir}/sip mkdir -p %{buildroot}%{_datadir}/sip
# Point to the correct location for the documentation files
sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README
# sip executable is provided by python-sip-bin to avoid conflicts # sip executable is provided by python-sip-bin to avoid conflicts
rm %{buildroot}%{_bindir}/sip rm %{buildroot}%{_bindir}/sip
%clean
rm -rf %{buildroot}
%files %files
%defattr(-,root,root) %defattr(-,root,root,-)
%doc README %doc README
%{python3_sitearch}/sip.so %{python3_sitearch}/sip.so
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root,-)
%doc NEWS LICENSE doc %doc NEWS LICENSE* doc/
%{py3_incdir}/sip.h %{py3_incdir}/sip.h
%{python3_sitearch}/sipconfig.py %{python3_sitearch}/sipconfig.py
%{python3_sitearch}/sipdistutils.py %{python3_sitearch}/sipdistutils.py
%{_datadir}/sip %{_datadir}/sip/
%changelog %changelog