diff --git a/babel.spec b/babel.spec index 30610bd..55e3086 100644 --- a/babel.spec +++ b/babel.spec @@ -6,14 +6,16 @@ # And pytest is at this point not yet ready %global bootstrap 0 -# build without Python 2 support. This setting allows us to -# "flip the switch" easily once Fedora actually drops support -# for Python 2. -%global with_python2 1 +# Build without Python 2 support from F32 on. +%if !0%{?fedora}%{?rhel} || 0%{?fedora} >= 32 || 0%{?rhel} >= 9 +%bcond_with python2 +%else +%bcond_without python2 +%endif Name: babel Version: 2.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tools for internationalizing Python applications License: BSD @@ -22,7 +24,7 @@ Source0: https://files.pythonhosted.org/packages/source/B/%{srcname}/%{sr BuildArch: noarch -%if %{with_python2} +%if %{with python2} BuildRequires: python2-devel BuildRequires: python2-setuptools %if 0%{?fedora} < 32 @@ -59,7 +61,7 @@ Babel is composed of two major parts: and date formatting, etc. -%if %{with_python2} +%if %{with python2} %package -n python2-babel Summary: %sum @@ -82,6 +84,10 @@ Babel is composed of two major parts: %package -n python3-babel Summary: %sum +%if %{without python2} +Obsoletes: python2-babel < 2.7.0-6%{?dist} +%endif + Requires: python3-setuptools Requires: python3-pytz @@ -111,7 +117,7 @@ Documentation for Babel %autosetup -n %{srcname}-%{version} %build -%if %{with_python2} +%if %{with python2} %py2_build %endif %py3_build @@ -130,14 +136,14 @@ rm -f "$BUILDDIR/html/.buildinfo" %endif %install -%if %{with_python2} +%if %{with python2} %py2_install %endif %py3_install %check export TZ=America/New_York -%if %{with_python2} && 0%{?fedora} < 32 +%if %{with python2} %{__python2} -m pytest %endif %if !%{bootstrap} @@ -149,7 +155,7 @@ export TZ=America/New_York %license LICENSE %{_bindir}/pybabel -%if %{with_python2} +%if %{with python2} %files -n python2-babel %{python2_sitelib}/Babel-%{version}-py*.egg-info %{python2_sitelib}/babel @@ -165,6 +171,9 @@ export TZ=America/New_York %endif %changelog +* Thu Oct 31 2019 Nils Philippsen - 2.7.0-6 +- drop python2-babel from F32 on + * Fri Sep 13 2019 Miro HronĨok - 2.7.0-5 - Reduce Python 2 build dependencies on Fedora 32