From 659fdaf208c9de14382c04680cab775a62fe91d8 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Aug 22 2019 14:53:49 +0000 Subject: Subpackage python2-pyramid has been removed --- diff --git a/python-pyramid.spec b/python-pyramid.spec index e1933b9..99613d6 100644 --- a/python-pyramid.spec +++ b/python-pyramid.spec @@ -1,7 +1,3 @@ -%if 0%{?fedora} -%global with_python3 1 -%endif - %global modname pyramid %global sum The Pyramid web application framework, a Pylons project %global desc Pyramid is a small, fast, down-to-earth, open source Python web development\ @@ -12,7 +8,7 @@ fun, more predictable, and more productive. Name: python-%{modname} Version: 1.10.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: BSD @@ -20,32 +16,8 @@ URL: https://trypyramid.com/ Source0: %pypi_source %{modname} BuildArch: noarch -BuildRequires: python2-chameleon >= 1.2.3 -BuildRequires: python2-mako >= 0.3.6 -BuildRequires: python2-repoze-lru >= 0.4 -BuildRequires: python2-venusian >= 1.0 -BuildRequires: python2-webtest -BuildRequires: python2-zope-deprecation >= 3.5.0 -BuildRequires: python2-devel -BuildRequires: python2-docutils -BuildRequires: python2-hupper -BuildRequires: python2-plaster -BuildRequires: python2-plaster-pastedeploy -BuildRequires: python2-setuptools -BuildRequires: python2-translationstring -BuildRequires: python2-venusian >= 1.0 -BuildRequires: python2-zope-component >= 3.6.0 -BuildRequires: python2-zope-configuration -BuildRequires: python2-zope-interface >= 3.8.0 - -%if 0%{?fedora} -BuildRequires: python2-webob >= 1.8.3 -%else -BuildRequires: python-webob1.8 >= 1.8.3 -%endif -%if 0%{?with_python3} BuildRequires: python3-chameleon >= 1.2.3 BuildRequires: python3-devel BuildRequires: python3-docutils @@ -67,32 +39,20 @@ BuildRequires: python3-webob >= 1.8.3 %else BuildRequires: python3-webob1.8 >= 1.8.3 %endif -%endif %description %{desc} -%package -n python2-pyramid -Summary: %{sum} - -%{?python_provide:%python_provide python2-pyramid} - - -%description -n python2-pyramid -%{desc} - - -%if 0%{?with_python3} %package -n python3-pyramid Summary: %{sum} %{?python_provide:%python_provide python3-pyramid} +Conflicts: python2-pyramid < 1.10.4-4 %description -n python3-pyramid %{desc} -%endif %prep @@ -101,89 +61,26 @@ Summary: %{sum} # Remove bundled egg info rm -rf %{modname}.egg-info -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif %build -%if 0%{?with_python3} -pushd %{py3dir} %py3_build -popd -%endif - -%py2_build %install -%if 0%{?with_python3} -pushd %{py3dir} %py3_install # Create the Python 3 executables. for e in pcreate pserve prequest proutes pshell ptweens pviews pdistreport; do mv %{buildroot}/%{_bindir}/$e %{buildroot}/%{_bindir}/$e-%{python3_version}; ln -s %{_bindir}/$e-%{python3_version} %{buildroot}/%{_bindir}/$e-3; -done; - -popd -%endif - -%py2_install -# Create the Python 2 executables. -for e in pcreate pserve prequest proutes pshell ptweens pviews pdistreport; do - mv %{buildroot}/%{_bindir}/$e %{buildroot}/%{_bindir}/$e-%{python2_version}; - ln -s %{_bindir}/$e-%{python2_version} %{buildroot}/%{_bindir}/$e-2; - ln -s %{_bindir}/$e-%{python2_version} %{buildroot}/%{_bindir}/$e + ln -s %{_bindir}/$e-%{python3_version} %{buildroot}/%{_bindir}/$e done; %check -%if 0%{?with_python3} -pushd %{py3dir} - %{__python3} setup.py test -popd -%endif - -%if 0%{?rhel} && 0%{?rhel} <= 6 -# Tests on el6 fail for unknown reasons. -%else -%{__python2} setup.py test -%endif -%files -n python2-pyramid -%license LICENSE.txt -%doc README.rst -%{python2_sitelib}/%{modname}/ -%{python2_sitelib}/%{modname}-%{version}*.egg-info -%{_bindir}/pcreate -%{_bindir}/pcreate-%{python2_version} -%{_bindir}/pcreate-2 -%{_bindir}/pdistreport -%{_bindir}/pdistreport-%{python2_version} -%{_bindir}/pdistreport-2 -%{_bindir}/prequest -%{_bindir}/prequest-%{python2_version} -%{_bindir}/prequest-2 -%{_bindir}/proutes -%{_bindir}/proutes-%{python2_version} -%{_bindir}/proutes-2 -%{_bindir}/pserve -%{_bindir}/pserve-%{python2_version} -%{_bindir}/pserve-2 -%{_bindir}/pshell -%{_bindir}/pshell-%{python2_version} -%{_bindir}/pshell-2 -%{_bindir}/ptweens -%{_bindir}/ptweens-%{python2_version} -%{_bindir}/ptweens-2 -%{_bindir}/pviews -%{_bindir}/pviews-%{python2_version} -%{_bindir}/pviews-2 -%if 0%{?with_python3} %files -n python3-pyramid %license LICENSE.txt %doc README.rst @@ -191,23 +88,34 @@ popd %{python3_sitelib}/%{modname}-%{version}*.egg-info %{_bindir}/pcreate-%{python3_version} %{_bindir}/pcreate-3 +%{_bindir}/pcreate %{_bindir}/pdistreport-%{python3_version} %{_bindir}/pdistreport-3 +%{_bindir}/pdistreport %{_bindir}/prequest-%{python3_version} %{_bindir}/prequest-3 +%{_bindir}/prequest %{_bindir}/proutes-%{python3_version} %{_bindir}/proutes-3 +%{_bindir}/proutes %{_bindir}/pserve-%{python3_version} %{_bindir}/pserve-3 +%{_bindir}/pserve %{_bindir}/pshell-%{python3_version} %{_bindir}/pshell-3 +%{_bindir}/pshell %{_bindir}/ptweens-%{python3_version} %{_bindir}/ptweens-3 +%{_bindir}/ptweens %{_bindir}/pviews-%{python3_version} %{_bindir}/pviews-3 -%endif +%{_bindir}/pviews %changelog +* Thu Aug 22 2019 Miro Hrončok - 1.10.4-4 +- Subpackage python2-pyramid has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Sun Aug 18 2019 Miro Hrončok - 1.10.4-3 - Rebuilt for Python 3.8