Hello community, here is the log from the commit of package python-sip for openSUSE:Factory checked in at Sun Sep 11 19:35:23 CEST 2011.
-------- --- python-sip/python-sip.changes 2011-08-16 02:25:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-sip/python-sip.changes 2011-08-30 11:45:24.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 29 18:41:49 UTC 2011 - [email protected] + +- Add python-sip-bin package to avoid conflicts between python2 + and python3 versions + +------------------------------------------------------------------- python3-sip.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sip.spec ++++++ --- /var/tmp/diff_new_pack.jBh8NH/_old 2011-09-11 19:35:17.000000000 +0200 +++ /var/tmp/diff_new_pack.jBh8NH/_new 2011-09-11 19:35:17.000000000 +0200 @@ -24,7 +24,7 @@ Group: Development/Libraries/Python Summary: SIP tool to use python sip bindings Version: 4.12.4 -Release: 1 +Release: 3 %define rversion %version Url: http://www.riverbankcomputing.com/software/sip/intro BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,9 +43,8 @@ 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 @@ 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 @@ %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 ++++++ python3-sip.spec ++++++ --- /var/tmp/diff_new_pack.jBh8NH/_old 2011-09-11 19:35:17.000000000 +0200 +++ /var/tmp/diff_new_pack.jBh8NH/_new 2011-09-11 19:35:17.000000000 +0200 @@ -23,7 +23,7 @@ Group: Development/Libraries/Python Summary: SIP tool to use python sip bindings Version: 4.12.4 -Release: 1 +Release: 2 %define rversion %version Url: http://www.riverbankcomputing.com/software/sip/intro BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,8 +32,13 @@ 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 @@ 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 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 @@ %files devel %defattr(-,root,root) %doc NEWS LICENSE doc -/usr/bin/sip %{py3_incdir}/sip.h %{python3_sitearch}/sipconfig.py %{python3_sitearch}/sipdistutils.py ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
