From 2147eaa7d5f71a5e53978a205876381b8f25c830 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Sun, 27 Dec 2020 18:05:58 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/babel.git#8b0683ee151dd2776159a22588bc2a9d047ef172
---
 babel.spec | 59 ++++++------------------------------------------------
 1 file changed, 6 insertions(+), 53 deletions(-)

diff --git a/babel.spec b/babel.spec
index ee5d7f0..e42631c 100644
--- a/babel.spec
+++ b/babel.spec
@@ -6,18 +6,9 @@
 # And pytest is at this point not yet ready
 %bcond_with bootstrap
 
-# There is an exception to ship python2-babel on Fedora, for trac:
-# https://pagure.io/fesco/issue/2260
-%if 0%{?fedora}
-%bcond_without python2
-%else
-%bcond_with python2
-%endif
-
-
 Name:           babel
 Version:        2.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tools for internationalizing Python applications
 
 License:        BSD
@@ -26,10 +17,6 @@ Source0:        %{pypi_source}
 
 BuildArch:      noarch
 
-%if %{with python2}
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-%endif
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 %if !%{with bootstrap}
@@ -58,33 +45,9 @@ Babel is composed of two major parts:
   and date formatting, etc.
 
 
-%if %{with python2}
-%package -n python2-babel
-Summary:        %sum
-
-Requires:       python2-setuptools
-Requires:       python2-pytz
-
-%{?python_provide:%python_provide python2-babel}
-
-%description -n python2-babel
-Babel is composed of two major parts:
-
-* tools to build and work with gettext message catalogs
-
-* a Python interface to the CLDR (Common Locale Data Repository),
-  providing access to various locale display names, localized number
-  and date formatting, etc.
-%endif
-
-
 %package -n python3-babel
 Summary:        %sum
 
-%if %{without python2}
-Obsoletes:      python2-babel < 2.7.0-6%{?dist}
-%endif
-
 Requires:       python3-setuptools
 Requires:       python3-pytz
 
@@ -103,7 +66,6 @@ Babel is composed of two major parts:
 %package doc
 Summary:        Documentation for Babel
 Provides:       python-babel-doc = %{version}-%{release}
-Provides:       python2-babel-doc = %{version}-%{release}
 Provides:       python3-babel-doc = %{version}-%{release}
 
 %description doc
@@ -114,9 +76,6 @@ Documentation for Babel
 %autosetup -p1 -n %{srcname}-%{version}
 
 %build
-%if %{with python2}
-%py2_build
-%endif
 %py3_build
 
 BUILDDIR="$PWD/built-docs"
@@ -133,9 +92,6 @@ rm -f "$BUILDDIR/html/.buildinfo"
 %endif
 
 %install
-%if %{with python2}
-%py2_install
-%endif
 %py3_install
 
 %check
@@ -149,15 +105,9 @@ export TZ=UTC
 %license LICENSE
 %{_bindir}/pybabel
 
-%if %{with python2}
-%files -n python2-babel
-%{python2_sitelib}/Babel-%{version}-py*.egg-info
-%{python2_sitelib}/babel
-%endif
-
 %files -n python3-babel
-%{python3_sitelib}/Babel-%{version}-py*.egg-info
-%{python3_sitelib}/babel
+%{python3_sitelib}/Babel-%{version}-py*.egg-info/
+%{python3_sitelib}/babel/
 
 %if !%{with bootstrap}
 %files doc
@@ -165,6 +115,9 @@ export TZ=UTC
 %endif
 
 %changelog
+* Mon Dec 21 2020 Miro Hrončok <mhroncok@redhat.com> - 2.9.0-3
+- Disable Python 2 build entirely
+
 * Tue Nov 24 2020 Miro Hrončok <mhroncok@redhat.com>
 - Disable Python 2 build on RHEL 9+