3 changed files with 60 additions and 46 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/idna-2.10.tar.gz
+SOURCES/idna-2.8.tar.gz
--- a/.python-idna.metadata
+++ b/.python-idna.metadata
@ -1 +1 @@
-ab9b7f0143cc0095da8439939eee9ce153af5f60 SOURCES/idna-2.10.tar.gz
+c1e59def26dac74a2ec53181032df76d40368657 SOURCES/idna-2.8.tar.gz
--- a/SPECS/python-idna.spec
+++ b/SPECS/python-idna.spec
@ -1,17 +1,30 @@
+%global with_python3 1
 %global srcname idna

+# Prepared for Python 2 removal
+%bcond_with python2
+
 Name:           python-%{srcname}
-Version:        2.10
-Release:        7%{?dist}
+Version:        2.8
+Release:        6%{?dist}
 Summary:        Internationalized Domain Names in Applications (IDNA)

 License:        BSD and Python and Unicode
 URL:            https://github.com/kjd/idna
 Source0:        https://pypi.io/packages/source/i/%{srcname}/%{srcname}-%{version}.tar.gz
 BuildArch:      noarch
+# Exclude i686 arch. Due to a modularity issue it's being added to the
+# x86_64 compose of CRB, but we don't want to ship it at all.
+# See: https://projects.engineering.redhat.com/browse/RCM-72605
+ExcludeArch:    i686

-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
+%if %{with python2}
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+%endif
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-rpm-macros

 %description
 A library to support the Internationalised Domain Names in Applications (IDNA)
@ -23,11 +36,27 @@ The library is also intended to act as a suitable drop-in replacement for the
 "encodings.idna" module that comes with the Python standard library but
 currently only supports the older 2003 specification.

-%package -n python3-%{srcname}
+%if %{with python2}
+%package -n python2-%{srcname}
+Summary:        Internationalized Domain Names in Applications (IDNA)
+%{?python_provide:%python_provide python2-%{srcname}}
+
+%description -n python2-%{srcname}
+A library to support the Internationalised Domain Names in Applications (IDNA)
+protocol as specified in RFC 5891 <http://tools.ietf.org/html/rfc5891>.  This
+version of the protocol is often referred to as "IDNA2008" and can produce
+different results from the earlier standard from 2003.
+
+The library is also intended to act as a suitable drop-in replacement for the
+"encodings.idna" module that comes with the Python standard library but
+currently only supports the older 2003 specification.
+%endif
+
+%package -n python%{python3_pkgversion}-%{srcname}
 Summary:        Internationalized Domain Names in Applications (IDNA)
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}

-%description -n python3-%{srcname}
+%description -n python%{python3_pkgversion}-%{srcname}
 A library to support the Internationalised Domain Names in Applications (IDNA)
 protocol as specified in RFC 5891 <http://tools.ietf.org/html/rfc5891>.  This
 version of the protocol is often referred to as "IDNA2008" and can produce
@ -43,59 +72,44 @@ currently only supports the older 2003 specification.
 rm -rf %{srcname}.egg-info

 %build
+%if %{with python2}
+%py2_build
+%endif
 %py3_build

 %install
 %py3_install
+%if %{with python2}
+%py2_install
+%endif

 %check
+%if %{with python2}
+%{__python2} setup.py test
+%endif
 %{__python3} setup.py test


-%files -n python3-%{srcname}
+%if %{with python2}
+%files -n python2-%{srcname}
+%license LICENSE.rst
+%doc README.rst HISTORY.rst
+%{python2_sitelib}/%{srcname}
+%{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info
+%endif
+
+%files -n python%{python3_pkgversion}-%{srcname}
 %license LICENSE.rst
 %doc README.rst HISTORY.rst
 %{python3_sitelib}/%{srcname}
 %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info

 %changelog
-* Mon Feb 21 2022 Tomas Orsava <torsava@redhat.com> - 2.10-7
- Add gating configuration and a simple smoke test
- Related: rhbz#1950291
+* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 2.8-6
+- Exclude unsupported i686 arch

-* Tue Feb 08 2022 Tomas Orsava <torsava@redhat.com> - 2.10-6
- Add automatically generated Obsoletes tag with the python39- prefix
-  for smoother upgrade from RHEL8
- Related: rhbz#1990421
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.10-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.10-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 07 2020 Lumír Balhar <lbalhar@redhat.com> - 2.10-1
- Update to 2.10 (#1851653)
-
-* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 2.9-2
- Rebuilt for Python 3.9
-
-* Tue May 05 2020 Lumír Balhar <lbalhar@redhat.com> - 2.9-1
- Update to 2.9 (#1803654)
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Nov 24 2019 Miro Hrončok <mhroncok@redhat.com> - 2.8-5
- Subpackage python2-idna has been removed
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+* Wed Nov 20 2019 Lumír Balhar <lbalhar@redhat.com> - 2.8-5
+- Adjusted for Python 3.8 module in RHEL 8

 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.8-4
 - Rebuilt for Python 3.8.0rc1 (#1748018)
@ -139,7 +153,7 @@ rm -rf %{srcname}.egg-info
 - Update to version 2.4

 * Tue Feb 28 2017 Paul Wouters <pwouters@redhat.com> - 2.3-1
- Resolves: rhbz#1427499 Update to 2.3 for IDNAError bugfix and memory improvement
+- Resolves bugzilla 1427499 Update to 2.3 for IDNAError bugfix and memory improvement

 * Thu Feb 09 2017 Jeremy Cline <jeremy@jcline.org> - 2.2-1
 - Update to version 2.2 (#1406757)