diff --git a/python-sip.changes b/python-sip.changes index d31c014..95ed6c9 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Sun Oct 20 07:42:07 UTC 2013 - lbeltrame@kde.org + +- Use alternatives for /usr/bin/sip to prevent conflicts between + Python 3 and Python 2 python-sip-devel packages + +------------------------------------------------------------------- +Thu Oct 17 12:41:50 UTC 2013 - toddrme2178@gmail.com + +- update to v4.15.3. This is a bug fix release for a regression + that affects PyQtChart. + +------------------------------------------------------------------- +Thu Sep 19 10:37:30 UTC 2013 - toddrme2178@gmail.com + +- update to v4.15.2. This is a minor functional release that will + be needed by PyQt v5.1. It also contains bug fixes needed by + PyKDE4. + +------------------------------------------------------------------- +Tue Sep 17 13:31:42 UTC 2013 - speilicke@suse.com + +- Revert sr#79987, moving /usr/bin/sip into python-sip-bin and requiring + that in python3-sip-devel (plus split provides) only causes trouble. It will + make python3-sip-devel depend forever on Python2 for absolutely no reason. + Both python-sip-devel and python3-sip-devel can happily provide /usr/bin/sip + since the binary is identical. You can have both installed in parallel and + remove either without breaking anything. (bnc#835161) + ------------------------------------------------------------------- Wed Sep 11 06:48:38 UTC 2013 - tittiatcoke@gmail.com diff --git a/python-sip.spec b/python-sip.spec index a30c5ac..3f79a90 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -20,7 +20,7 @@ %define python_sip_api 10.1 Name: python-sip -Version: 4.15.1 +Version: 4.15.3 Release: 0 Summary: SIP tool to use python sip bindings License: GPL-2.0 or GPL-3.0 or SUSE-SIP @@ -50,7 +50,9 @@ Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: c++_compiler Requires: python-devel -Requires: python-sip-bin +Requires(post): update-alternatives +Provides: python-sip-bin = %{version} +Obsoletes: python-sip-bin < %{version} %description devel SIP is a tool that makes it very easy to create Python bindings for C @@ -61,19 +63,6 @@ for any C or C++ library. This package contains all the developer tools you need to create your own sip bindings. -%package bin -Summary: SIP tool to create python bindings -Group: Development/Libraries/Python -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 @@ -98,26 +87,40 @@ echo "%%requires_python_sip_api Requires: python-sip(api) = $sip_major.$sip_mino %install make DESTDIR=%{buildroot} install - mkdir -p %{buildroot}%{_datadir}/sip + +# For alternatives +mv %{buildroot}%{_bindir}/sip %{buildroot}%{_bindir}/sip-%{py_ver} +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +touch %{buildroot}%{_sysconfdir}/alternatives/sip +ln -s -f %{_sysconfdir}/alternatives/sip %{buildroot}/%{_bindir}/sip + install -m 644 -D macros.%name %{buildroot}/%{_sysconfdir}/rpm/macros.%name # Point to the correct location for the documentation files sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README +%post devel +update-alternatives --install %{_bindir}/sip sip %{_bindir}/sip-%{py_ver} 50 + +%preun devel + +if ["$1" = 0] ; then + update-alternatives --remove sip %{_bindir}/sip-%{py_ver} +fi + %files %defattr(-,root,root,-) %doc README %{py_sitedir}/sip.so -%files bin -%defattr(-,root,root,-) -%{_bindir}/sip - %files devel %defattr(-,root,root,-) %doc NEWS LICENSE* doc/ %config %{_sysconfdir}/rpm/macros.%name +%{_bindir}/sip-%{py_ver} +%ghost %{_sysconfdir}/alternatives/sip +%{_bindir}/sip %{py_incdir}/sip.h %{py_sitedir}/sipconfig.py %{py_sitedir}/sipdistutils.py diff --git a/python3-sip.changes b/python3-sip.changes index 04dbb8d..5d479d1 100644 --- a/python3-sip.changes +++ b/python3-sip.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Sun Oct 20 07:42:54 UTC 2013 - lbeltrame@kde.org + +- Use alternatives for /usr/bin/sip to prevent conflicts between + Python 3 and Python 2 python-sip-devel packages + +------------------------------------------------------------------- +Thu Oct 17 12:41:50 UTC 2013 - toddrme2178@gmail.com + +- update to v4.15.3. This is a bug fix release for a regression + that affects PyQtChart. + +------------------------------------------------------------------- +Tue Sep 24 09:42:26 UTC 2013 - toddrme2178@gmail.com + +- Fix building on openSUSE 12.2. The approach is kind of ugly, + but it is the only way I can find that works. Feel free to improve + it. + +------------------------------------------------------------------- +Thu Sep 19 10:37:30 UTC 2013 - toddrme2178@gmail.com + +- update to v4.15.2. This is a minor functional release that will + be needed by PyQt v5.1. It also contains bug fixes needed by + PyKDE4. + +------------------------------------------------------------------- +Tue Sep 17 13:31:52 UTC 2013 - speilicke@suse.com + +- Revert sr#79987, moving /usr/bin/sip into python-sip-bin and requiring + that in python3-sip-devel (plus split provides) only causes trouble. It will + make python3-sip-devel depend forever on Python2 for absolutely no reason. + Both python-sip-devel and python3-sip-devel can happily provide /usr/bin/sip + since the binary is identical. You can have both installed in parallel and + remove either without breaking anything. (bnc#835161) + ------------------------------------------------------------------- Wed Sep 11 06:49:37 UTC 2013 - tittiatcoke@gmail.com diff --git a/python3-sip.spec b/python3-sip.spec index 80510b9..28081bd 100644 --- a/python3-sip.spec +++ b/python3-sip.spec @@ -16,12 +16,11 @@ # -%global py3_incdir %(python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc(True))" 2>/dev/null || echo PYTHON-NOT-FOUND) %define rversion %{version} %define python_sip_api 10.1 Name: python3-sip -Version: 4.15.1 +Version: 4.15.3 Release: 0 Summary: SIP tool to use python sip bindings License: GPL-2.0 or GPL-3.0 or SUSE-SIP @@ -38,6 +37,9 @@ Provides: python3-sip(api) = %python_sip_api Requires(pre): python3 Requires(pre): python3-base BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} == 1220 +%define py3_incdir %{_includedir}/python3.2mu +%endif %description SIP is a tool that makes it very easy to create Python bindings for C @@ -50,9 +52,10 @@ 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(post): update-alternatives +Provides: python3-sip-bin = %{version} +Obsoletes: python3-sip-bin < %{version} %description devel SIP is a tool that makes it very easy to create Python bindings for C @@ -87,17 +90,29 @@ echo "%%requires_python3_sip_api Requires: python3-sip(api) = $sip_major.$sip_mi %install %{make_install} - mkdir -p %{buildroot}%{_datadir}/sip +# For alternatives +mv %{buildroot}%{_bindir}/sip %{buildroot}%{_bindir}/sip-%{py3_ver} +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +touch %{buildroot}%{_sysconfdir}/alternatives/sip +ln -s -f %{_sysconfdir}/alternatives/sip %{buildroot}/%{_bindir}/sip + # Point to the correct location for the documentation files sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README -# sip executable is provided by python-sip-bin to avoid conflicts -rm %{buildroot}%{_bindir}/sip - install -m 644 -D macros.%name %{buildroot}/%{_sysconfdir}/rpm/macros.%name +%post devel +# Lower priority than the python 2.x version for now +update-alternatives --install %{_bindir}/sip sip %{_bindir}/sip-%{py3_ver} 40 + +%preun devel + +if ["$1" = 0] ; then + update-alternatives --remove sip %{_bindir}/sip-%{py3_ver} +fi + %files %defattr(-,root,root,-) %doc README @@ -107,6 +122,9 @@ install -m 644 -D macros.%name %{buildroot}/%{_sysconfdir}/rpm/macros.%name %defattr(-,root,root,-) %doc NEWS LICENSE* doc/ %config %{_sysconfdir}/rpm/macros.%name +%{_bindir}/sip-%{py3_ver} +%ghost %{_sysconfdir}/alternatives/sip +%{_bindir}/sip %{py3_incdir}/sip.h %{python3_sitearch}/sipconfig.py %{python3_sitearch}/sipdistutils.py diff --git a/sip-4.15.1.tar.gz b/sip-4.15.1.tar.gz deleted file mode 100644 index d081422..0000000 --- a/sip-4.15.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e2c698d95685ec24c00c27ea05be55782b094616429a4256f63850530d676ad -size 772389 diff --git a/sip-4.15.3.tar.gz b/sip-4.15.3.tar.gz new file mode 100644 index 0000000..2c07020 --- /dev/null +++ b/sip-4.15.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46f245252866dbdb7fb5aca194bda991cc84ba8090d5e864765ee7e511a053d4 +size 773818