.gitignore

@@ -1 +1 @@
-SOURCES/MarkupSafe-1.1.1.tar.gz
+SOURCES/MarkupSafe-0.23.tar.gz

.python-markupsafe.metadata

@@ -1 +1 @@
-f70e5fd3c120a1b108d4347ea1115e3962c42026 SOURCES/MarkupSafe-1.1.1.tar.gz
+cd5c22acf6dd69046d6cb6a3920d84ea66bdf62a SOURCES/MarkupSafe-0.23.tar.gz

SPECS/python-markupsafe.spec

@@ -1,123 +1,55 @@
-%bcond_with python2
+Name: python-markupsafe
+Version: 0.23
+Release: 19%{?dist}
+Summary: Implements a XML/HTML/XHTML Markup safe string for Python
 
-Name:           python-markupsafe
+Group: Development/Languages
-Version:        1.1.1
+License: BSD
-Release:        6%{?dist}
+URL: http://pypi.python.org/pypi/MarkupSafe
-Summary:        Implements a XML/HTML/XHTML Markup safe string for Python
+Source0: http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-%{version}.tar.gz
-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
+BuildRequires: python3-devel python3-setuptools
-# 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 python3-markupsafe
-%package -n python2-markupsafe
+Summary: Implements a XML/HTML/XHTML Markup safe string for Python 3
-Summary:        Implements a XML/HTML/XHTML Markup safe string for Python 2
+Group: Development/Languages
-BuildRequires:  python2-devel
+%{?python_provide:%python_provide python3-markupsafe}
-BuildRequires:  python2dist(setuptools)
-%{?python_provide:%python_provide python2-markupsafe}
-
-%description -n python2-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:  python%{python3_pkgversion}-setuptools
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
-%{?python_provide:%python_provide python%{python3_pkgversion}-markupsafe}
-
-%description -n python%{python3_pkgversion}-markupsafe
-A library for safe markup escaping. Python 3 version.
 
+%description -n python3-markupsafe
+A library for safe markup escaping.
 
 %prep
-%autosetup -n MarkupSafe-%{version}
+%setup -q -n MarkupSafe-%{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
-
 %py3_install
 # C code errantly gets installed
-rm %{buildroot}%{python3_sitearch}/markupsafe/*.c
+rm $RPM_BUILD_ROOT/%{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
-%license LICENSE.rst
+%doc AUTHORS README.rst
-%doc CHANGES.rst README.rst
+%{python3_sitearch}/*
-%{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/
-%{python3_sitearch}/markupsafe/
 
 
 %changelog
-* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 1.1.1-6
+* Wed Jul 11 2018 Petr Viktorin <pviktori@redhat.com> - 0.23-19
-- Exclude unsupported i686 arch
+- Remove the Python 2 subpackage
+  https://bugzilla.redhat.com/show_bug.cgi?id=1590415
 
-* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 1.1.1-5
+* Mon Jun 25 2018 Lumír Balhar <lbalhar@redhat.com> - 0.23-18
-- Adjusted for Python 3.8 module in RHEL 8
+- Allow build with Python 2
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-4
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-3
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Feb 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-1
-- Update to 1.1.1 (#1680333)
-
-* Mon Feb 18 2019 Yatin Karel <ykarel@redhat.com> - 1.1.0-1
-- Update to 1.1.0
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jul 31 2018 Miro Hrončok <mhroncok@redhat.com> - 1.0-1
-- Update to 1.0 (#1430160)
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 0.23-18
-- Rebuilt for Python 3.7
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild