From 9ce3271a6d991214378c5d4de37cc0cd4f3a277b8f8831ebbfec9f9c992951b4 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 3 May 2013 09:14:06 +0000 Subject: [PATCH] - Apply update-alternatives for binaries and man-pages - Drop buildrequires on python-xml, I don't see it being used - Apply update-alternatives for binaries and man-pages - Drop buildrequires on python-xml, I don't see it being used OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-coverage?expand=0&rev=23 --- python-coverage.changes | 6 ++++++ python-coverage.spec | 26 ++++++++++++++++++++++++-- python3-coverage.changes | 6 ++++++ python3-coverage.spec | 19 +++++++++++++------ 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/python-coverage.changes b/python-coverage.changes index 69633c9..eba323e 100644 --- a/python-coverage.changes +++ b/python-coverage.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 3 09:15:27 UTC 2013 - speilicke@suse.com + +- Apply update-alternatives for binaries and man-pages +- Drop buildrequires on python-xml, I don't see it being used + ------------------------------------------------------------------- Mon Apr 29 11:55:07 UTC 2013 - dmueller@suse.com diff --git a/python-coverage.spec b/python-coverage.spec index 6c03b6f..bf7cb10 100644 --- a/python-coverage.spec +++ b/python-coverage.spec @@ -27,9 +27,13 @@ Source: http://pypi.python.org/packages/source/c/coverage/coverage-%{ver BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute -BuildRequires: python-xml +# Test requirements: +#BuildRequires: python-mock +#BuildRequires: python-nose Requires: python-distribute Requires: python-xml +Requires(post): update-alternatives +Requires(postun): update-alternatives %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %endif @@ -48,10 +52,28 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +#NOTE(saschpe): The following seems to mess with the install dir, which is odd: +#%%check +# Taken straight from tox.ini: +#python setup.py develop +#python igor.py zip_mods install_egg remove_extension +#python igor.py test_with_tracer py +#python setup.py --quiet build_ext --inplace +#python igor.py test_with_tracer c + +%post +update-alternatives \ + --install %{_bindir}/coverage coverage %{_bindir}/coverage-%{py_ver} 10 + +%postun +if [ $1 -eq 0 ] ; then + update-alternatives --remove coverage %{_bindir}/coverage-%{py_ver} +fi + %files %defattr(-,root,root,-) %doc AUTHORS.txt CHANGES.txt README.txt -%{_bindir}/coverage +%ghost %attr(0755,root,root) %{_bindir}/coverage %{_bindir}/coverage2 %{_bindir}/coverage-%{py_ver} %{python_sitearch}/coverage/ diff --git a/python3-coverage.changes b/python3-coverage.changes index eb3af3a..3203876 100644 --- a/python3-coverage.changes +++ b/python3-coverage.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 3 09:16:06 UTC 2013 - speilicke@suse.com + +- Apply update-alternatives for binaries and man-pages +- Drop buildrequires on python-xml, I don't see it being used + ------------------------------------------------------------------- Mon Apr 29 11:55:07 UTC 2013 - dmueller@suse.com diff --git a/python3-coverage.spec b/python3-coverage.spec index ad04e9f..8a58f48 100644 --- a/python3-coverage.spec +++ b/python3-coverage.spec @@ -25,13 +25,11 @@ License: BSD-3-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/c/coverage/coverage-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python3 -BuildRequires: python3-2to3 BuildRequires: python3-devel BuildRequires: python3-distribute -BuildRequires: python3-xml Requires: python3-distribute -Requires: python3-xml +Requires(post): update-alternatives +Requires(postun): update-alternatives %description Coverage.py measures code coverage, typically during test execution. It uses @@ -40,18 +38,27 @@ library to determine which lines are executable, and which have been executed. %prep %setup -q -n coverage-%{version} -sed -i "s|coverage =|coverage-%{py3_ver} =|" setup.py # Add Python version suffix to binaries %build -2to3 --nobackups --write . python3 setup.py build %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +%post +update-alternatives \ + --install %{_bindir}/coverage coverage %{_bindir}/coverage-%{py3_ver} 10 + +%postun +if [ $1 -eq 0 ] ; then + update-alternatives --remove coverage %{_bindir}/coverage-%{py3_ver} +fi + %files %defattr(-,root,root,-) %doc AUTHORS.txt CHANGES.txt README.txt +%ghost %attr(0755,root,root) %{_bindir}/coverage +%{_bindir}/coverage3 %{_bindir}/coverage-%{py3_ver} %{python3_sitearch}/coverage %{python3_sitearch}/coverage-%{version}-py%{py3_ver}.egg-info