diff --git a/python-sip.changes b/python-sip.changes index 37b7914..850c3a7 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 29 18:41:49 UTC 2011 - termim@gmail.com + +- Add python-sip-bin package to avoid conflicts between python2 + and python3 versions + ------------------------------------------------------------------- Tue Aug 16 00:07:23 UTC 2011 - termim@gmail.com diff --git a/python-sip.spec b/python-sip.spec index 08e99b1..8ca8e24 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -43,9 +43,8 @@ for any C or C++ library. License: GPL-2.0 or GPL-3.0 or SIP Group: Development/Libraries/Python Summary: SIP tool to create python bindings -Provides: python-sip:/usr/bin/sip Requires: %name = %version -Requires: c++_compiler python-devel +Requires: c++_compiler python-devel python-sip-bin %description devel SIP is a tool that makes it very easy to create Python bindings for C @@ -56,6 +55,21 @@ for any C or C++ library. This package contains all the developer tools you need to create your own sip bindings. + +%package bin +License: GPL-2.0 or GPL-3.0 or SIP +Group: Development/Libraries/Python +Summary: SIP tool to create python bindings +Provides: python-sip:/usr/bin/sip + +%description bin +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 the sip executable + %prep %setup -q -n sip-%{rversion} %patch0 @@ -81,10 +95,13 @@ rm -rf $RPM_BUILD_ROOT %doc README %{py_sitedir}/sip.so +%files bin +%defattr(-,root,root) +/usr/bin/sip + %files devel %defattr(-,root,root) %doc NEWS LICENSE doc -/usr/bin/sip %{py_incdir}/sip.h %{py_sitedir}/sipconfig.py %{py_sitedir}/sipdistutils.py diff --git a/python3-sip.changes b/python3-sip.changes index 50ae20e..3cacfe4 100644 --- a/python3-sip.changes +++ b/python3-sip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 29 18:41:49 UTC 2011 - termim@gmail.com + +- Add python-sip-bin package to avoid conflicts between python2 + and python3 versions + ------------------------------------------------------------------- Tue Aug 16 00:07:23 UTC 2011 - termim@gmail.com diff --git a/python3-sip.spec b/python3-sip.spec index 411e549..993ecb1 100644 --- a/python3-sip.spec +++ b/python3-sip.spec @@ -32,8 +32,13 @@ Patch0: disable-rpaths.diff Patch1: build-compare.diff BuildRequires: c++_compiler BuildRequires: python3 python3-devel -Requires: python3 python3-base -PreReq: python3 python3-base +Requires: python3 +PreReq: python3 + +%if 0%{?suse_version} > 1140 +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) @@ -49,7 +54,7 @@ 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 +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 @@ -76,6 +81,8 @@ make %{?jobs:-j %jobs} 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 +# sip executable is provided by python-sip-bin to avoid conflicts +rm $RPM_BUILD_ROOT/usr/bin/sip %clean rm -rf $RPM_BUILD_ROOT @@ -88,7 +95,6 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root) %doc NEWS LICENSE doc -/usr/bin/sip %{py3_incdir}/sip.h %{python3_sitearch}/sipconfig.py %{python3_sitearch}/sipdistutils.py