.gitignore

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

.python-idna.metadata

@@ -1 +1 @@
-499531b72bf0440ded6ce7f079a1f979270ae2d0 SOURCES/idna-2.5.tar.gz
+c1e59def26dac74a2ec53181032df76d40368657 SOURCES/idna-2.8.tar.gz

SPECS/python-idna.spec

@@ -1,22 +1,30 @@
-%bcond_without python3
+%global with_python3 1
 %global srcname idna
 
+# Prepared for Python 2 removal
+%bcond_with python2
+
 Name:           python-%{srcname}
-Version:        2.5
+Version:        2.8
-Release:        7%{?dist}
+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
 
+%if %{with python2}
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
-%if %{with python3}
+%endif
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
-%endif # with python3
+BuildRequires:  python%{python3_pkgversion}-rpm-macros
 
 %description
 A library to support the Internationalised Domain Names in Applications (IDNA)
@@ -28,6 +36,7 @@ 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.
 
+%if %{with python2}
 %package -n python2-%{srcname}
 Summary:        Internationalized Domain Names in Applications (IDNA)
 %{?python_provide:%python_provide python2-%{srcname}}
@@ -41,8 +50,8 @@ 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
 
-%if %{with python3}
 %package -n python%{python3_pkgversion}-%{srcname}
 Summary:        Internationalized Domain Names in Applications (IDNA)
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
@@ -56,56 +65,134 @@ 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
-%setup -q -n %{srcname}-%{version}
+%autosetup -p1 -n %{srcname}-%{version}
 # Remove bundled egg-info
 rm -rf %{srcname}.egg-info
 
 %build
+%if %{with python2}
 %py2_build
-
+%endif
-%if %{with python3}
 %py3_build
-%endif # with python3
 
 %install
-%if %{with python3}
 %py3_install
-%endif # with python3
+%if %{with python2}
-
 %py2_install
+%endif
 
 %check
+%if %{with python2}
 %{__python2} setup.py test
-
+%endif
-%if %{with python3}
 %{__python3} setup.py test
-%endif # with python3
 
 
+%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
 
-%if %{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
-* Wed Apr 03 2019 Tomas Orsava <torsava@redhat.com> - 2.5-7
+* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 2.8-6
-- Bumping due to problems with modular RPM upgrade path (#1695587)
+- Exclude unsupported i686 arch
-- Related: rhbz#1693974
 
-* Tue Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 2.5-6
+* Wed Nov 20 2019 Lumír Balhar <lbalhar@redhat.com> - 2.8-5
-- Switch python3 coditions to bcond
+- Adjusted for Python 3.8 module in RHEL 8
 
-* Mon Jul 16 2018 Lumír Balhar <lbalhar@redhat.com> - 2.5-5
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.8-4
-- First version for python27 module
+- 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
+- Update to v2.7 (rhbz 1589803)
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 19 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.5-3
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Mar 07 2017 Jeremy Cline <jeremy@jcline.org> - 2.5-1
+- Update to version 2.5
+
+* Wed Mar 01 2017 Jeremy Cline <jeremy@jcline.org> - 2.4-1
+- Update to version 2.4
+
+* Tue Feb 28 2017 Paul Wouters <pwouters@redhat.com> - 2.3-1
+- 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)
+
+* Fri Dec 09 2016 Charalampos Stratakis <cstratak@redhat.com> - 2.1-3
+- Rebuild for Python 3.6
+
+* Mon Nov 28 2016 Orion Poplawski <orion@cora.nwra.com> - 2.1-2
+- Ship python2-idna
+- Enable python3 for EPEL
+- Modernize spec
+
+* Mon Oct 17 2016 tom.prince@ualberta.net - 2.1-1
+- Bump version.
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-4
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Nov 04 2015 Robert Kuska <rkuska@redhat.com> - 2.0-2
+- Rebuilt for Python3.5 rebuild
+
+* Thu Aug 13 2015 Paul Wouters <pwouters@redhat.com> - 2.0-1
+- Update to 2.0 which is required by python-cryptography
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Dec 31 2014 tom.prince@ualberta.net - 1.0-1
+- Bump version.
+
+* Mon Oct 27 2014 tom.prince@ualberta.net - 0.8-3
+- Update licences.
+
+* Sat Jul 12 2014 tom.prince@ualberta.net - 0.8-2
+- Be more specfic about .egg-info directories.
+- Use python2-devel
+
+* Sat Jul 12 2014 tom.prince@ualberta.net - 0.8-1
+- Initial package.