From fd27893672ec91cfe57cf60453f472404e605e0b Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Oct 25 2019 05:23:12 +0000 Subject: Python 2 subpackage removed --- diff --git a/python-zope-interface.spec b/python-zope-interface.spec index a1d6358..09d791f 100644 --- a/python-zope-interface.spec +++ b/python-zope-interface.spec @@ -1,20 +1,8 @@ -%if 0%{?rhel} && 0%{?rhel} <= 6 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif - -# Filter private shared library provides -%filter_provides_in %{python2_sitearch}/zope/interface/.*\.so$ -%filter_setup - -%if 0%{?fedora} || 0%{?rhel} > 7 -%global with_python3 1 -%endif +%global debug_package %{nil} Name: python-zope-interface Version: 4.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Zope 3 Interface Infrastructure License: ZPLv2.1 URL: https://pypi.io/project/zope.interface @@ -26,28 +14,6 @@ or contract. This is a separate distribution of the zope.interface package used in Zope 3. -%package -n python2-zope-interface -Summary: Zope 3 Interface Infrastructure -%{?python_provide:%python_provide python2-zope-interface} - -BuildRequires: gcc -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-nose -BuildRequires: python2-zope-event - -Requires: python2-zope-event - -# since F14 -Obsoletes: python-zope-filesystem <= 1-8 - -%description -n python2-zope-interface -Interfaces are a mechanism for labeling objects as conforming to a given API -or contract. - -This is a separate distribution of the zope.interface package used in Zope 3. - -%if 0%{?with_python3} %package -n python3-zope-interface Summary: Zope 3 Interface Infrastructure %{?python_provide:%python_provide python3-zope-interface} @@ -64,60 +30,24 @@ Interfaces are a mechanism for labeling objects as conforming to a given API or contract. This is a separate distribution of the zope.interface package used in Zope 3. -%endif %prep %setup -n zope.interface-%{version} -q - rm -rf %{modname}.egg-info - %build -%py2_build -%if 0%{?with_python3} %py3_build -%endif - %install -# python3 block -%if 0%{?with_python3} %py3_install - # Will put docs in %%{_docdir} instead %{__rm} -f %{buildroot}%{python3_sitearch}/zope/interface/{,tests/}*.txt - # C files don't need to be packaged %{__rm} -f %{buildroot}%{python3_sitearch}/zope/interface/_zope_interface_coptimizations.c -%endif - -# do it again for python2 -%py2_install - -# Will put docs in %%{_docdir} instead -%{__rm} -f %{buildroot}%{python2_sitearch}/zope/interface/{,tests/}*.txt - -# C files don't need to be packaged -%{__rm} -f %{buildroot}%{python2_sitearch}/zope/interface/_zope_interface_coptimizations.c %check -PYTHONPATH=$(pwd) nosetests-2 -%if 0%{?with_python3} PYTHONPATH=$(pwd) nosetests-3 -%endif -%files -n python2-zope-interface -%doc README.rst CHANGES.rst COPYRIGHT.txt docs/ -%license LICENSE.txt -%{python2_sitearch}/zope/interface/ -# Co-own %%{python2_sitearch}/zope/ -%dir %{python2_sitearch}/zope/ -%exclude %{python2_sitearch}/zope/interface/tests/ -%exclude %{python2_sitearch}/zope/interface/common/tests/ -%{python2_sitearch}/zope.interface-*.egg-info -%{python2_sitearch}/zope.interface-*-nspkg.pth - -%if 0%{?with_python3} %files -n python3-zope-interface %doc README.rst CHANGES.rst COPYRIGHT.txt docs/ %license LICENSE.txt @@ -128,9 +58,11 @@ PYTHONPATH=$(pwd) nosetests-3 %exclude %{python3_sitearch}/zope/interface/common/tests/ %{python3_sitearch}/zope.interface-*.egg-info %{python3_sitearch}/zope.interface-*-nspkg.pth -%endif %changelog +* Fri Oct 25 2019 Lumír Balhar - 4.6.0-5 +- Python 2 subpackage removed + * Thu Oct 03 2019 Miro Hrončok - 4.6.0-4 - Rebuilt for Python 3.8.0rc1 (#1748018)