From 691946ba5dccfbbcf3e92250f3bb6811358d496a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 4 Nov 2017 12:20:25 +0100 Subject: [PATCH] Revert "Add platform-python subpackage" This reverts commit 781a1de263b3db1baf3ebb13e1ca50373e403b3d. Signed-off-by: Igor Gnatenko --- python-coverage.spec | 60 +++++--------------------------------------- 1 file changed, 6 insertions(+), 54 deletions(-) diff --git a/python-coverage.spec b/python-coverage.spec index da4bc58..08fda6b 100644 --- a/python-coverage.spec +++ b/python-coverage.spec @@ -1,12 +1,8 @@ %if 0%{?fedora} || 0%{?rhel} >= 8 -%bcond_without python2 %bcond_without python3 -%bcond_without platform_python %else %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%bcond_without python2 %bcond_with python3 -%bcond_with platform_python %endif # %%global prever b1 @@ -17,7 +13,7 @@ Name: python-coverage Summary: Code coverage testing module for Python Version: 4.4.1 -Release: 4%{?prever}%{?dist} +Release: 5%{?prever}%{?dist} # jquery(MIT): # coverage/htmlfiles/jquery.min.js # MIT or GPL: @@ -28,15 +24,10 @@ License: ASL 2.0 and MIT and (MIT or GPL) Group: System Environment/Libraries URL: http://nedbatchelder.com/code/modules/coverage.html Source0: http://pypi.python.org/packages/source/c/coverage/coverage-%{version}%{?prever}.tar.gz -%if %{with python2} BuildRequires: python2-setuptools, python2-devel -%endif %if %{with python3} BuildRequires: python3-setuptools, python3-devel %endif -%if %{with platform_python} -BuildRequires: platform-python-setuptools, platform-python-devel -%endif %description Coverage.py is a Python module that measures code coverage during Python @@ -44,7 +35,6 @@ execution. It uses the code analysis tools and tracing hooks provided in the Python standard library to determine which lines are executable, and which have been executed. -%if %{with python2} %package -n python2-coverage Summary: Code coverage testing module for Python 2 Group: System Environment/Libraries @@ -63,7 +53,6 @@ Coverage.py is a Python 2 module that measures code coverage during Python execution. It uses the code analysis tools and tracing hooks provided in the Python standard library to determine which lines are executable, and which have been executed. -%endif # with python2 %if %{with python3} %package -n python3-coverage @@ -78,6 +67,7 @@ Provides: bundled(js-jquery-debounce) = 1.1 Provides: bundled(js-jquery-hotkeys) = 0.8 Provides: bundled(js-jquery-isonscreen) = 1.2.0 Provides: bundled(js-jquery-tablesorter) +Obsoletes: platform-python-coverage < 4.4.1-5 %description -n python3-coverage Coverage.py is a Python 3 module that measures code coverage during Python @@ -86,23 +76,6 @@ Python standard library to determine which lines are executable, and which have been executed. %endif # with python3 -%if %{with platform_python} -%package -n platform-python-coverage -Summary: Code coverage testing module for Platform Python -Group: System Environment/Libraries -Provides: bundled(js-jquery) = 1.11.1 -Provides: bundled(js-jquery-debounce) = 1.1 -Provides: bundled(js-jquery-hotkeys) = 0.8 -Provides: bundled(js-jquery-isonscreen) = 1.2.0 -Provides: bundled(js-jquery-tablesorter) - -%description -n platform-python-coverage -Coverage.py is a Python 3 module that measures code coverage during Python -execution. It uses the code analysis tools and tracing hooks provided in the -Python standard library to determine which lines are executable, and which -have been executed. -%endif # with platform_python - %prep %setup -q -n coverage-%{version}%{?prever} @@ -117,29 +90,16 @@ sed -i 's/\r//g' README.rst %py3_build %endif # if with python3 -%if %{with platform_python} -%platform_py_build -%endif - %install -%if %{with platform_python} -%platform_py_install -rm %{buildroot}/%{_bindir}/* -%endif # if with platform_python - %if %{with python3} %py3_install mv %{buildroot}/%{_bindir}/coverage %{buildroot}/%{_bindir}/python3-coverage %endif # if with python3 -%if %{with python2} %py2_install -%endif # if with python2 - # rename binaries, make compat symlinks pushd %{buildroot}%{_bindir} -%if %{with python2} mv coverage python-coverage rm -rf coverage-2* coverage2 @@ -147,7 +107,6 @@ rm -rf coverage-2* coverage2 for i in python2-coverage coverage coverage2 coverage-%{?python2_shortver}; do ln -s python-coverage $i done -%endif # if with python2 %if %{with python3} rm -rf coverage-3* coverage3 @@ -158,7 +117,6 @@ done %endif # if with python3 popd -%if %{with python2} %files -n python2-coverage %license LICENSE.txt NOTICE.txt %doc README.rst @@ -169,7 +127,6 @@ popd %{_bindir}/python2-coverage %{python2_sitearch}/coverage/ %{python2_sitearch}/coverage*.egg-info/ -%endif # if with python2 %if %{with python3} %files -n python3-coverage @@ -182,15 +139,10 @@ popd %{python3_sitearch}/coverage*.egg-info/ %endif # if with python3 -%if %{with platform_python} -%files -n platform-python-coverage -%license LICENSE.txt NOTICE.txt -%doc README.rst -%{platform_python_sitearch}/coverage/ -%{platform_python_sitearch}/coverage*.egg-info/ -%endif # if with platform_python - %changelog +* Sat Nov 04 2017 Igor Gnatenko - 4.4.1-5 +- Remove platform-python subpackage + * Tue Aug 08 2017 Miro Hrončok - 4.4.1-4 - Add platform-python subpackage @@ -218,7 +170,7 @@ popd * Fri Dec 09 2016 Charalampos Stratakis - 4.2-2 - Rebuild for Python 3.6 -* Fri Jul 29 2016 Tom Callaway - 4.2-1 +* Fri Jul 19 2016 Tom Callaway - 4.2-1 - 4.2 final * Tue Jul 19 2016 Fedora Release Engineering - 4.2-0.2.b1