3 changed files with 113 additions and 109 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/Jinja2-2.10.1.tar.gz
+SOURCES/Jinja2-2.11.3.tar.gz
--- a/.python-jinja2.metadata
+++ b/.python-jinja2.metadata
@ -1 +1 @@
-896a71a32336487edf1216d5d73dd3b26c4d7431 SOURCES/Jinja2-2.10.1.tar.gz
+034173d87c9c5d1c2000f337be45b582dc0eb172 SOURCES/Jinja2-2.11.3.tar.gz
--- a/SPECS/python-jinja2.spec
+++ b/SPECS/python-jinja2.spec
@ -1,3 +1,21 @@
+%global srcname Jinja2
+
+Name:           python-jinja2
+Version:        2.11.3
+Release:        1%{?dist}
+Summary:        General purpose template engine
+License:        BSD
+URL:            https://palletsprojects.com/p/jinja/
+Source0:        %{pypi_source}
+
+
+%if 0%{?fedora} || 0%{?rhel} > 7
+# Enable python3 build by default
+%bcond_without python3
+%else
+%bcond_with python3
+%endif
+
 %if 0%{?rhel} > 7
 # Disable python2 build by default
 %bcond_with python2
@ -5,36 +23,21 @@
 %bcond_without python2
 %endif

-%if 0%{?fedora} || 0%{?rhel} > 7
-%bcond_without python3
-%else
-%bcond_with python3
-%endif
-
 # Enable building without docs to avoid a circular dependency between this
 # and python-sphinx:
-%if %{with python3}
-%bcond_without docs
-%else
 %bcond_with docs
-%endif

-%if 0%{?fedora} > 25 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} > 7
 %bcond_without async
 %else
 %bcond_with async
 %endif

-Name:           python-jinja2
-Version:        2.10.1
-Release:        2%{?dist}
-Summary:        General purpose template engine
-Group:          Development/Languages
-License:        BSD
-URL:            http://jinja.pocoo.org/
-Source0:        https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-%{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

 %description
 Jinja2 is a template engine written in pure Python.  It provides a
@ -53,9 +56,10 @@ environments.
 Summary:        General purpose template engine for python2
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
-BuildRequires:  python2-markupsafe
-BuildRequires:  python2-pytest
-Requires:       python2-markupsafe
+BuildRequires:  python2-babel >= 0.8
+BuildRequires:  python2-markupsafe >= 0.23
+Requires:       python2-babel >= 0.8
+Requires:       python2-markupsafe >= 0.23
 Requires:       python2-setuptools
 %{?python_provide:%python_provide python2-jinja2}

@ -73,27 +77,27 @@ environments.


 %if %{with python3}
-%package -n python3-jinja2
+%package -n python%{python3_pkgversion}-jinja2
 Summary:        General purpose template engine for python3
-Group:          Development/Languages
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-babel >= 0.8
-BuildRequires:  python3-markupsafe
-BuildRequires:  python3-pytest
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-babel >= 0.8
+BuildRequires:  python%{python3_pkgversion}-markupsafe >= 0.23
+BuildRequires:  python%{python3_pkgversion}-pytest
+BuildRequires:  python%{python3_pkgversion}-rpm-macros
 %if %{with docs}
-BuildRequires:  %{_bindir}/sphinx-build-3
+BuildRequires:  %{_bindir}/sphinx-build-3.8
+BuildRequires:  make
+BuildRequires:  python%{python3_pkgversion}-Pallets-Sphinx-Themes
+BuildRequires:  python%{python3_pkgversion}-sphinxcontrib-log-cabinet
+BuildRequires:  python%{python3_pkgversion}-sphinx-issues
 %endif
-Requires:       python3-babel >= 0.8
-Requires:       python3-markupsafe
-%if 0%{?rhel} && 0%{?rhel} >= 8
-Requires:       platform-python-setuptools
-%else
-Requires:       python3-setuptools
-%endif
-%{?python_provide:%python_provide python3-jinja2}
+Requires:       python%{python3_pkgversion}-babel >= 0.8
+Requires:       python%{python3_pkgversion}-markupsafe >= 0.23
+Requires:       python%{python3_pkgversion}-setuptools
+%{?python_provide:%python_provide python%{python3_pkgversion}-jinja2}

-%description -n python3-jinja2
+%description -n python%{python3_pkgversion}-jinja2
 Jinja2 is a template engine written in pure Python.  It provides a
 Django inspired non-XML syntax but supports inline expressions and an
 optional sandboxed environment.
@ -107,100 +111,74 @@ environments.


 %prep
-%setup -qc -n Jinja2-%{version}
+%autosetup -p1 -n %{srcname}-%{version}
+
 # cleanup
-find Jinja2-%{version} -name '*.pyo' -o -name '*.pyc' -delete
-
-# fix EOL
-sed -i 's|\r$||g' Jinja2-%{version}/LICENSE
-
-mv Jinja2-%{version} python2
-cp -av python2 python3
-
+find . -name '*.pyo' -o -name '*.pyc' -delete

 %build
 %if %{with python2}
-pushd python2
 %py2_build
-popd
 %endif # with python2

 %if %{with python3}
-pushd python3
 %py3_build
 %if %{with docs}
 make -C docs html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-3
+# remove hidden file
+rm -rf docs/_build/html/.buildinfo
 %endif # with docs
-popd
 %endif # with python3


 %install
 %if %{with python2}
-pushd python2
 %py2_install

 # these files are valid only on Python 3.6+
 rm %{buildroot}%{python2_sitelib}/jinja2/asyncsupport.py
 rm %{buildroot}%{python2_sitelib}/jinja2/asyncfilters.py
-popd
 %endif # with python2

 %if %{with python3}
-pushd python3
 %py3_install

-%if %{with docs}
-# remove hidden file
-rm -rf docs/_build/html/.buildinfo
-%endif
-
 %if ! %{with async}
 # these files are valid only on Python 3.6+
 rm %{buildroot}%{python3_sitelib}/jinja2/asyncsupport.py
 rm %{buildroot}%{python3_sitelib}/jinja2/asyncfilters.py
 %endif # ! with async
-popd
 %endif # with python3


 %check
-%if %{with python2}
-pushd python2
-# there are currently no tests in the jinja2 tarball
-# make test
-popd
-%endif # with python2
-
 %if %{with python3}
-pushd python3
-# there are currently no tests in the jinja2 tarball
-# make test
-popd
+PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest tests
 %endif # with python3


 %if %{with python2}
 %files -n python2-jinja2
-%doc python2/AUTHORS
-%doc python2/CHANGES.rst
-%doc python2/ext
-%doc python2/examples
-%license python2/LICENSE
+%doc CHANGES.rst
+%doc ext
+%doc examples
+%license LICENSE.rst
+%if %{with docs}
+%doc docs/_build/html
+%endif
 %{python2_sitelib}/jinja2
 %{python2_sitelib}/Jinja2-%{version}-py?.?.egg-info
 %endif # with python2


 %if %{with python3}
-%files -n python3-jinja2
-%doc python3/AUTHORS
-%doc python3/CHANGES.rst
-%doc python3/ext
-%doc python3/examples
-%license python3/LICENSE
+%files -n python%{python3_pkgversion}-jinja2
+%doc CHANGES.rst
+%doc ext
+%doc examples
+%license LICENSE.rst
 %if %{with docs}
-%doc python3/docs/_build/html
+%doc docs/_build/html
 %endif
 %{python3_sitelib}/jinja2
 %{python3_sitelib}/Jinja2-%{version}-py?.?.egg-info
@ -208,36 +186,62 @@ popd


 %changelog
-* Tue Apr 30 2019 Lumír Balhar <lbalhar@redhat.com> - 2.10.1-2
- Rebuild of package to go through gating
- Resolves: rhbz#1701301
+* Fri May 20 2022 Maxwell G <gotmax@e.email> - 2.11.3-1
+- Update to 2.11.3.
+- Fix URL.
+- Remove patch that is included in this release.
+Resolves: rhbz#2086141.

-* Thu Apr 25 2019 Lumír Balhar <lbalhar@redhat.com> - 2.10.1-1
- Rebase to 2.10.1 (security update) to fix CVE-2019-10906
- Resolves: rhbz#1701301
+* Fri Mar 12 2021 Lumír Balhar <lbalhar@redhat.com> - 2.10.3-5
+- Fix CVE-2020-28493: ReDOS vulnerability due to the sub-pattern
+Resolves: rhbz#1928707

-* Fri Nov 16 2018 Lumír Balhar <lbalhar@redhat.com> - 2.10-9
- Require platform-python-setuptools instead of python3-setuptools
- Resolves: rhbz#1650536
+* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 2.10.3-4
+- Exclude unsupported i686 arch

-* Mon Aug 06 2018 Lumír Balhar <lbalhar@redhat.com> - 2.10-8
- Revert changes commited to wrong branch
+* Wed Nov 20 2019 Lumír Balhar <lbalhar@redhat.com> - 2.10.3-3
+- Adjusted for Python 3.8 module in RHEL 8

-* Sat Aug 04 2018 Lumír Balhar <lbalhar@redhat.com> - 2.10-7
- Fix conditions
+* Wed Nov 20 2019 Thomas Moschny <thomas.moschny@gmx.de> - 2.10.3-2
+- Add missing BR on make.

-* Sat Aug 04 2018 Lumír Balhar <lbalhar@redhat.com> - 2.10-6
- Specfile cleanup and fixes
+* Mon Nov 11 2019 Lumír Balhar <lbalhar@redhat.com> - 2.10.3-1
+- New upstream version (2.10.3)

-* Mon Jun 25 2018 Lumír Balhar <Lbalhar@redhat.com> - 2.10-5
- Disable Python 2 build by default
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.10.1-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)

-* Mon Jun 25 2018 Lumír Balhar <Lbalhar@redhat.com> - 2.10-4
- Allow build with Python 2
+* Sat Aug 17 2019 Miro Hrončok <mhroncok@redhat.com> - 2.10.1-4
+- Rebuilt for Python 3.8

-* Mon May 28 2018 Petr Viktorin <pviktori@redhat.com> - 2.10-3
- Remove docs from Python 2 package
- Remove dependency on python2-babel and python2-sphinx
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 2.10.1-3
+- Bootstrap for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Apr 10 2019 Thomas Moschny <thomas.moschny@gmx.de> - 2.10.1-1
+- Update to 2.10.1.
+- Update specfile.
+
+* Wed Feb 27 2019 Phil Wyett <philwyett@kathenas.org> - 2.10-8
+- Fix FTBS due to bad conditional
+- Add version requirement for markupsafe
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 2.10-5
+- Rebuilt for Python 3.7
+
+* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 2.10-4
+- Bootstrap for Python 3.7
+
+* Mon Apr 16 2018 Charalampos Stratakis <cstratak@redhat.com> - 2.10-3
+- Don't build the Python 2 subpackage on EL > 7

 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild