From a2e5caf1cf0c5a813a7ab2095e98c8b23c0cd14a Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Sep 18 2019 15:48:23 +0000 Subject: Subpackage python2-flask has been removed --- diff --git a/python-flask.spec b/python-flask.spec index 8d83032..dfa1db7 100644 --- a/python-flask.spec +++ b/python-flask.spec @@ -3,7 +3,7 @@ Name: python-%{modname} Version: 1.0.2 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 Summary: A micro-framework for Python based on Werkzeug, Jinja 2 and good intentions @@ -25,35 +25,6 @@ authentication technologies and more. %description %{_description} -%package -n python2-%{modname} -Summary: %{summary} -%{?python_provide:%python_provide python2-%{modname}} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pytest -%if 0%{?fedora} >= 26 -BuildRequires: python2-werkzeug -Requires: python2-werkzeug -BuildRequires: python2-jinja2 -Requires: python2-jinja2 -BuildRequires: python2-click -Requires: python2-click -BuildRequires: python2-itsdangerous -Requires: python2-itsdangerous -%else -BuildRequires: python-werkzeug -Requires: python-werkzeug -BuildRequires: python-jinja2 -Requires: python-jinja2 -BuildRequires: python-click -Requires: python-click -BuildRequires: python-itsdangerous -Requires: python-itsdangerous -%endif -%description -n python2-%{modname} %{_description} - -Python 2 version. - %package -n python%{python3_pkgversion}-%{modname} Summary: %{summary} %{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}} @@ -68,6 +39,7 @@ Requires: python%{python3_pkgversion}-jinja2 Requires: python%{python3_pkgversion}-werkzeug Requires: python%{python3_pkgversion}-itsdangerous Requires: python%{python3_pkgversion}-click +Conflicts: python2-%{modname} < 1.0.2-8 %description -n python%{python3_pkgversion}-%{modname} %{_description} @@ -86,38 +58,22 @@ rm -rf examples/flaskr/ rm -rf examples/minitwit/ %build -%py2_build %py3_build %install -%py2_install -mv %{buildroot}%{_bindir}/%{modname}{,-%{python2_version}} -ln -s %{modname}-%{python2_version} %{buildroot}%{_bindir}/%{modname}-2 - %py3_install mv %{buildroot}%{_bindir}/%{modname}{,-%{python3_version}} ln -s %{modname}-%{python3_version} %{buildroot}%{_bindir}/%{modname}-3 - -ln -sf %{modname}-2 %{buildroot}%{_bindir}/%{modname} +ln -sf %{modname}-3 %{buildroot}%{_bindir}/%{modname} %check export LC_ALL=C.UTF-8 -PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python2_version} -v -PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v || : - -%files -n python2-%{modname} -%license LICENSE -%doc CHANGES.rst README.rst -%{_bindir}/%{modname}-2 -%{_bindir}/%{modname}-%{python2_version} -%{python2_sitelib}/%{srcname}-*.egg-info/ -%{python2_sitelib}/%{modname}/ - -%{_bindir}/%{modname} +PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v -k "not test_send_from_directory_bad_request" %files -n python%{python3_pkgversion}-%{modname} %license LICENSE %doc CHANGES.rst README.rst +%{_bindir}/%{modname} %{_bindir}/%{modname}-3 %{_bindir}/%{modname}-%{python3_version} %{python3_sitelib}/%{srcname}-*.egg-info/ @@ -128,6 +84,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v || : %doc examples %changelog +* Wed Sep 18 2019 Miro Hrončok - 1:1.0.2-8 +- Subpackage python2-flask has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Sat Aug 17 2019 Miro Hrončok - 1:1.0.2-7 - Rebuilt for Python 3.8