SPECS/python-idna.spec

@@ -2,22 +2,21 @@
 
 Name:           python-%{srcname}
 Version:        2.10
-Release:        7%{?dist}.1
+Release:        3%{?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
-
-# Security fix for CVE-2024-3651
-# Upstream: https://github.com/kjd/idna/commit/5beb28b9dd77912c0dd656d8b0fdba3eb80222e7
-# Tracking bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2274779
-Patch:          CVE-2024-3651.patch
-
 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:  python%{python3_pkgversion}-devel
-BuildRequires:  python3-setuptools
+BuildRequires:  python%{python3_pkgversion}-rpm-macros
+BuildRequires:  python%{python3_pkgversion}-setuptools
 
 %description
 A library to support the Internationalised Domain Names in Applications (IDNA)
@@ -29,11 +28,11 @@ 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}
+%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
@@ -58,35 +57,20 @@ rm -rf %{srcname}.egg-info
 %{__python3} setup.py test
 
 
-%files -n python3-%{srcname}
+%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
-* Tue Apr 23 2024 Lumír Balhar <lbalhar@redhat.com> - 2.10-7.1
-- Security fix for CVE-2024-3651
-Resolves: RHEL-33464
-
-* Mon Feb 21 2022 Tomas Orsava <torsava@redhat.com> - 2.10-7
-- Add gating configuration and a simple smoke test
-- Related: rhbz#1950291
 
-* Tue Feb 08 2022 Tomas Orsava <torsava@redhat.com> - 2.10-6
+%changelog
-- Add automatically generated Obsoletes tag with the python39- prefix
+* Fri May 24 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.10-3
-  for smoother upgrade from RHEL8
+- Rebuilt for MSVSphere 8.10
-- 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
+* Wed Jan 13 2021 Tomas Orsava <torsava@redhat.com> - 2.10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Convert from Fedora to the python39 module in RHEL8
+- Resolves: rhbz#1877430
 
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild