.gitignore

@@ -1 +1 @@
-SOURCES/idna-2.10.tar.gz
+SOURCES/idna-2.5.tar.gz

.python-idna.metadata

@@ -1 +1 @@
-ab9b7f0143cc0095da8439939eee9ce153af5f60 SOURCES/idna-2.10.tar.gz
+499531b72bf0440ded6ce7f079a1f979270ae2d0 SOURCES/idna-2.5.tar.gz

SPECS/python-idna.spec

@@ -1,8 +1,21 @@
 %global srcname idna
 
+%if 0%{?fedora} || 0%{?rhel} >= 8
+%bcond_without python3
+%else
+%bcond_with python3
+%endif
+
+%if 0%{?rhel} > 7
+# Disable python2 build by default
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
+
 Name:           python-%{srcname}
-Version:        2.10
+Version:        2.5
-Release:        7%{?dist}.1
+Release:        7%{?dist}
 Summary:        Internationalized Domain Names in Applications (IDNA)
 
 License:        BSD and Python and Unicode
@@ -16,8 +29,14 @@ Patch:          CVE-2024-3651.patch
 
 BuildArch:      noarch
 
-BuildRequires:  python3-devel
+%if 0%{?with_python2}
-BuildRequires:  python3-setuptools
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+%endif # with_python2
+%if 0%{?with_python3}
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-setuptools
+%endif # with_python3
 
 %description
 A library to support the Internationalised Domain Names in Applications (IDNA)
@@ -29,11 +48,28 @@ 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 0%{?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 # with_python2
+
+%if 0%{?with_python3}
+%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
@@ -42,6 +78,7 @@ 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 # with_python3
 
 %prep
 %autosetup -p1 -n %{srcname}-%{version}
@@ -49,88 +86,59 @@ currently only supports the older 2003 specification.
 rm -rf %{srcname}.egg-info
 
 %build
+%if 0%{?with_python2}
+%py2_build
+%endif # with_python2
+
+%if 0%{?with_python3}
 %py3_build
+%endif # with_python3
 
 %install
+%if 0%{?with_python3}
 %py3_install
+%endif # with_python3
+
+%if 0%{?with_python2}
+%py2_install
+%endif # with_python2
 
 %check
+%if 0%{?with_python2}
+%{__python2} setup.py test
+%endif # with_python2
+
+%if 0%{?with_python3}
 %{__python3} setup.py test
+%endif # with_python3
 
+%if 0%{?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 # with_python2
 
-%files -n python3-%{srcname}
+%if 0%{?with_python3}
+%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
+%endif # with_python3
 
 %changelog
-* Tue Apr 23 2024 Lumír Balhar <lbalhar@redhat.com> - 2.10-7.1
+* Thu Apr 25 2024 Lumír Balhar <lbalhar@redhat.com> - 2.5-7
-- Security fix for CVE-2024-3651
+- Fix patch application for security fix for CVE-2024-3651
-Resolves: RHEL-33464
+Resolves: RHEL-32703
 
-* Mon Feb 21 2022 Tomas Orsava <torsava@redhat.com> - 2.10-7
+* Tue Apr 23 2024 Lumír Balhar <lbalhar@redhat.com> - 2.5-6
-- Add gating configuration and a simple smoke test
+- Security fix for CVE-2024-3651
-- Related: rhbz#1950291
+Resolves: RHEL-32703
-
-* 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
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.8-4
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 2.8-3
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue May 28 2019 Jeremy Cline <jcline@redhat.com> - 2.8-1
-- Update to v2.8
-- Drop python version conditionals
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 2.7-2
-- Rebuilt for Python 3.7
 
-* Tue Jun 12 2018 Jeremy Cline <jeremy@jcline.org> - 2.7-1
+* Thu Jun 28 2018 Christian Heimes <cheimes@redhat.com> - 2.5-5
-- Update to v2.7 (rhbz 1589803)
+- Drop Python 2 subpackage from RHEL 8, fixes RHBZ#1590399
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild