SPECS/python-markupsafe.spec

@@ -1,42 +1,24 @@
-%bcond_with python2
-
 Name:           python-markupsafe
 Version:        1.1.1
-Release:        6%{?dist}
+Release:        12%{?dist}
 Summary:        Implements a XML/HTML/XHTML Markup safe string for Python
 License:        BSD
 URL:            https://pypi.org/project/MarkupSafe/
 Source0:        %pypi_source MarkupSafe
 
-# 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:  gcc
 
 %description
 A library for safe markup escaping.
 
-%if %{with python2}
-%package -n python2-markupsafe
-Summary:        Implements a XML/HTML/XHTML Markup safe string for Python 2
-BuildRequires:  python2-devel
-BuildRequires:  python2dist(setuptools)
-%{?python_provide:%python_provide python2-markupsafe}
 
-%description -n python2-markupsafe
+%package -n python3-markupsafe
-A library for safe markup escaping. Python 2 version.
-%endif
-
-%package -n python%{python3_pkgversion}-markupsafe
 Summary:        Implements a XML/HTML/XHTML Markup safe string for Python 3
-BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python3-devel
-BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python3dist(setuptools)
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
+%{?python_provide:%python_provide python3-markupsafe}
-%{?python_provide:%python_provide python%{python3_pkgversion}-markupsafe}
 
-%description -n python%{python3_pkgversion}-markupsafe
+%description -n python3-markupsafe
 A library for safe markup escaping. Python 3 version.
 
 
@@ -45,40 +27,20 @@ A library for safe markup escaping. Python 3 version.
 
 
 %build
-%if %{with python2}
-%py2_build
-%endif
-
 %py3_build
 
-%install
-%if %{with python2}
-%py2_install
-# C code errantly gets installed
-rm %{buildroot}%{python2_sitearch}/markupsafe/*.c
-%endif
 
+%install
 %py3_install
 # C code errantly gets installed
 rm %{buildroot}%{python3_sitearch}/markupsafe/*.c
 
 
 %check
-%if %{with python2}
-%{__python2} setup.py test
-%endif
 %{__python3} setup.py test
 
 
-%if %{with python2}
+%files -n python3-markupsafe
-%files -n python2-markupsafe
-%license LICENSE.rst
-%doc CHANGES.rst README.rst
-%{python2_sitearch}/MarkupSafe-%{version}-py%{python2_version}.egg-info/
-%{python2_sitearch}/markupsafe/
-%endif
-
-%files -n python%{python3_pkgversion}-markupsafe
 %license LICENSE.rst
 %doc CHANGES.rst README.rst
 %{python3_sitearch}/MarkupSafe-%{version}-py%{python3_version}.egg-info/
@@ -86,14 +48,30 @@ rm %{buildroot}%{python3_sitearch}/markupsafe/*.c
 
 
 %changelog
-* Mon Dec 11 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.1.1-6
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.1-12
-- Rebuilt for MSVSphere 8.8
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.1-11
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Dec 21 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-9
+- Disable Python 2 entirely
+
+* Wed Nov 25 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-8
+- Disable Python 2 in ELN
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 1.1.1-6
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-6
-- Exclude unsupported i686 arch
+- Rebuilt for Python 3.9
 
-* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 1.1.1-5
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-5
-- Adjusted for Python 3.8 module in RHEL 8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-4
 - Rebuilt for Python 3.8.0rc1 (#1748018)