Compare commits

...

No commits in common. "c8-stream-3.8" and "stream-python27-2.7-rhel-8.9.0" have entirely different histories.

5 changed files with 64 additions and 86 deletions

3
.gitignore vendored
View File

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

View File

@ -1 +0,0 @@
f70e5fd3c120a1b108d4347ea1115e3962c42026 SOURCES/MarkupSafe-1.1.1.tar.gz

View File

@ -1,123 +1,89 @@
%bcond_with python2
%bcond_without python3
%global debug_package %{nil}
Name: python-markupsafe
Version: 1.1.1
Release: 6%{?dist}
Summary: Implements a XML/HTML/XHTML Markup safe string for Python
License: BSD
URL: https://pypi.org/project/MarkupSafe/
Source0: %pypi_source MarkupSafe
Name: python-markupsafe
Version: 0.23
Release: 19%{?dist}
Summary: Implements a XML/HTML/XHTML Markup safe string for Python
# 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
Group: Development/Languages
License: BSD
URL: http://pypi.python.org/pypi/MarkupSafe
Source0: http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-%{version}.tar.gz
BuildRequires: gcc
BuildRequires: python2-devel python2-setuptools
%if %{with python3}
BuildRequires: python3-devel python3-setuptools
%endif
%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)
Summary: Implements a XML/HTML/XHTML Markup safe string for Python 2
Group: Development/Languages
%{?python_provide:%python_provide python2-markupsafe}
%description -n python2-markupsafe
A library for safe markup escaping. Python 2 version.
A library for safe markup escaping.
%if %{with python3}
%package -n python3-markupsafe
Summary: Implements a XML/HTML/XHTML Markup safe string for Python 3
Group: Development/Languages
%{?python_provide:%python_provide python3-markupsafe}
%description -n python3-markupsafe
A library for safe markup escaping.
%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.
%prep
%autosetup -n MarkupSafe-%{version}
%setup -q -n MarkupSafe-%{version}
%build
%if %{with python2}
%py2_build
%endif
%if %{with python3}
%py3_build
%endif
%install
%if %{with python2}
%py2_install
# C code errantly gets installed
rm %{buildroot}%{python2_sitearch}/markupsafe/*.c
%endif
rm $RPM_BUILD_ROOT/%{python2_sitearch}/markupsafe/*.c
%if %{with python3}
%py3_install
# C code errantly gets installed
rm %{buildroot}%{python3_sitearch}/markupsafe/*.c
rm $RPM_BUILD_ROOT/%{python3_sitearch}/markupsafe/*.c
%endif
%check
%if %{with python2}
%{__python2} setup.py test
%endif
%if %{with python3}
%{__python3} setup.py test
%if %{with python2}
%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/
%{python3_sitearch}/markupsafe/
%files -n python2-markupsafe
%license LICENSE
%doc AUTHORS README.rst
%{python2_sitearch}/*
%if %{with python3}
%files -n python3-markupsafe
%doc AUTHORS LICENSE README.rst
%{python3_sitearch}/*
%endif
%changelog
* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 1.1.1-6
- Exclude unsupported i686 arch
* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 0.23-19
- Bumping due to problems with modular RPM upgrade path
- Resolves: rhbz#1695587
* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 1.1.1-5
- Adjusted for Python 3.8 module in RHEL 8
* 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
* Tue Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 0.23-18
- Make possible to disable python3 subpackage
- Disable debugsource package
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

11
rpminspect.yaml Normal file
View File

@ -0,0 +1,11 @@
# We have disabled the debuginfo package
# generation due to issues with modularity
debuginfo:
ignore:
- /usr/lib*/python*/site-packages/markupsafe/_speedups.so
# In a modular build rpminspect confuses the python2-libs for a
# subpackage of markupsafe. Ignore this check.
rpmdeps:
ignore:
requires: ^libpython[0-9]+\.[0-9]+\.so.*\(\)\(.*\)$

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (MarkupSafe-0.23.tar.gz) = 4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28