|
|
@ -1,32 +1,15 @@
|
|
|
|
%if 0%{?rhel} > 7
|
|
|
|
|
|
|
|
# Disable python2 build by default
|
|
|
|
|
|
|
|
%bcond_with python2
|
|
|
|
|
|
|
|
%else
|
|
|
|
|
|
|
|
%bcond_without python2
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%global modname flask
|
|
|
|
%global modname flask
|
|
|
|
%global srcname Flask
|
|
|
|
%global srcname Flask
|
|
|
|
|
|
|
|
|
|
|
|
Name: python-%{modname}
|
|
|
|
Name: python-%{modname}
|
|
|
|
Version: 0.12.2
|
|
|
|
Version: 2.0.3
|
|
|
|
Release: 4%{?dist}
|
|
|
|
Release: 1%{?dist}.1
|
|
|
|
Epoch: 1
|
|
|
|
Epoch: 1
|
|
|
|
Summary: A micro-framework for Python based on Werkzeug, Jinja 2 and good intentions
|
|
|
|
Summary: A micro-framework for Python based on Werkzeug, Jinja 2 and good intentions
|
|
|
|
|
|
|
|
|
|
|
|
License: BSD
|
|
|
|
License: BSD
|
|
|
|
URL: http://flask.pocoo.org/
|
|
|
|
URL: http://flask.pocoo.org/
|
|
|
|
Source0: https://github.com/pallets/flask/releases/download/%{version}/Flask-%{version}.tar.gz
|
|
|
|
Source0: %{pypi_source}
|
|
|
|
|
|
|
|
|
|
|
|
# rhbz#1623180
|
|
|
|
|
|
|
|
# Backported just this patch because 0.12.3+ have added other changes we cannot take.
|
|
|
|
|
|
|
|
Patch0001: 0001-detect-UTF-encodings-when-loading-json.patch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# rhbz#1585318
|
|
|
|
|
|
|
|
# Backport 0.12.4 changes, other than the theme changes which cause no end of problems since
|
|
|
|
|
|
|
|
# they depend on their own pallets_sphinx_theme module.
|
|
|
|
|
|
|
|
Patch0002: 0002-Fix-ValueError-for-some-invalid-Range-requests.patch
|
|
|
|
|
|
|
|
Patch0003: 0003-be-smarter-about-adding-.cli-to-reloader-command.patch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BuildArch: noarch
|
|
|
|
BuildArch: noarch
|
|
|
|
|
|
|
|
|
|
|
@ -42,142 +25,141 @@ authentication technologies and more.
|
|
|
|
|
|
|
|
|
|
|
|
%description %{_description}
|
|
|
|
%description %{_description}
|
|
|
|
|
|
|
|
|
|
|
|
%if %{with python2}
|
|
|
|
%package -n python3-%{modname}
|
|
|
|
%package -n python2-%{modname}
|
|
|
|
|
|
|
|
Summary: %{summary}
|
|
|
|
Summary: %{summary}
|
|
|
|
%{?python_provide:%python_provide python2-%{modname}}
|
|
|
|
%{?python_provide:%python_provide python3-%{modname}}
|
|
|
|
BuildRequires: python2-devel
|
|
|
|
BuildRequires: python3-devel
|
|
|
|
BuildRequires: python2-setuptools
|
|
|
|
BuildRequires: python3dist(setuptools)
|
|
|
|
BuildRequires: python2-pytest
|
|
|
|
BuildRequires: python3dist(werkzeug) >= 0.15
|
|
|
|
%if 0%{?fedora} >= 26
|
|
|
|
BuildRequires: python3dist(jinja2) >= 2.10.1
|
|
|
|
BuildRequires: python2-werkzeug
|
|
|
|
BuildRequires: python3dist(itsdangerous) >= 0.24
|
|
|
|
Requires: python2-werkzeug
|
|
|
|
BuildRequires: python3dist(click) >= 5.1
|
|
|
|
BuildRequires: python2-jinja2
|
|
|
|
BuildRequires: python3dist(pytest)
|
|
|
|
Requires: python2-jinja2
|
|
|
|
Obsoletes: python2-%{modname} < 1:1.0.2-9
|
|
|
|
BuildRequires: python2-click
|
|
|
|
|
|
|
|
Requires: python2-click
|
|
|
|
%description -n python3-%{modname} %{_description}
|
|
|
|
BuildRequires: python2-itsdangerous
|
|
|
|
|
|
|
|
Requires: python2-itsdangerous
|
|
|
|
|
|
|
|
%else
|
|
|
|
|
|
|
|
BuildRequires: python-werkzeug
|
|
|
|
|
|
|
|
Requires: python-werkzeug
|
|
|
|
|
|
|
|
BuildRequires: python-jinja2
|
|
|
|
|
|
|
|
Requires: python-jinja2
|
|
|
|
|
|
|
|
BuildRequires: python-click
|
|
|
|
|
|
|
|
Requires: python-click
|
|
|
|
|
|
|
|
BuildRequires: python-itsdangerous
|
|
|
|
|
|
|
|
Requires: python-itsdangerous
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
%description -n python2-%{modname} %{_description}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Python 2 version.
|
|
|
|
|
|
|
|
%endif # with python2
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%package -n python%{python3_pkgversion}-%{modname}
|
|
|
|
|
|
|
|
Summary: %{summary}
|
|
|
|
|
|
|
|
%{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}}
|
|
|
|
|
|
|
|
BuildRequires: python%{python3_pkgversion}-devel
|
|
|
|
|
|
|
|
BuildRequires: python%{python3_pkgversion}-setuptools
|
|
|
|
|
|
|
|
BuildRequires: python%{python3_pkgversion}-pytest
|
|
|
|
|
|
|
|
BuildRequires: python%{python3_pkgversion}-jinja2
|
|
|
|
|
|
|
|
BuildRequires: python%{python3_pkgversion}-werkzeug
|
|
|
|
|
|
|
|
BuildRequires: python%{python3_pkgversion}-itsdangerous
|
|
|
|
|
|
|
|
BuildRequires: python%{python3_pkgversion}-click
|
|
|
|
|
|
|
|
Requires: python%{python3_pkgversion}-jinja2
|
|
|
|
|
|
|
|
Requires: python%{python3_pkgversion}-werkzeug
|
|
|
|
|
|
|
|
Requires: python%{python3_pkgversion}-itsdangerous
|
|
|
|
|
|
|
|
Requires: python%{python3_pkgversion}-click
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%description -n python%{python3_pkgversion}-%{modname} %{_description}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Python 3 version.
|
|
|
|
Python 3 version.
|
|
|
|
|
|
|
|
|
|
|
|
%package doc
|
|
|
|
%package doc
|
|
|
|
Summary: Documentation for %{name}
|
|
|
|
Summary: Documentation for %{name}
|
|
|
|
Obsoletes: python%{python3_pkgversion}-%{modname}-doc < 1:0.11.1-3
|
|
|
|
Obsoletes: python3-%{modname}-doc < 1:0.11.1-3
|
|
|
|
BuildRequires: python3-sphinx
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%description doc
|
|
|
|
%description doc
|
|
|
|
Documentation and examples for %{name}.
|
|
|
|
Documentation and examples for %{name}.
|
|
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
%prep
|
|
|
|
%autosetup -p1 -n %{srcname}-%{version}
|
|
|
|
%autosetup -n %{srcname}-%{version}
|
|
|
|
rm -rf examples/flaskr/
|
|
|
|
rm -rf examples/flaskr/
|
|
|
|
rm -rf examples/minitwit/
|
|
|
|
rm -rf examples/minitwit/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# RHEL 9 version of jinja2 is 2.11
|
|
|
|
|
|
|
|
# Everything passes the tests with 2.11
|
|
|
|
|
|
|
|
sed -i "s/Jinja2 >= 3.0/Jinja2 >= 2.11/" setup.py
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
%build
|
|
|
|
%if %{with python2}
|
|
|
|
|
|
|
|
%py2_build
|
|
|
|
|
|
|
|
%endif # with python2
|
|
|
|
|
|
|
|
%py3_build
|
|
|
|
%py3_build
|
|
|
|
PYTHONPATH=`pwd` sphinx-build-3 -b html docs/ docs/_build/html/
|
|
|
|
|
|
|
|
rm -rf docs/_build/html/{.buildinfo,.doctrees}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
%install
|
|
|
|
%if %{with python2}
|
|
|
|
|
|
|
|
%py2_install
|
|
|
|
|
|
|
|
mv %{buildroot}%{_bindir}/%{modname}{,-%{python2_version}}
|
|
|
|
|
|
|
|
ln -s %{modname}-%{python2_version} %{buildroot}%{_bindir}/%{modname}-2
|
|
|
|
|
|
|
|
%endif # with python2
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%py3_install
|
|
|
|
%py3_install
|
|
|
|
mv %{buildroot}%{_bindir}/%{modname}{,-%{python3_version}}
|
|
|
|
mv %{buildroot}%{_bindir}/%{modname}{,-%{python3_version}}
|
|
|
|
ln -s %{modname}-%{python3_version} %{buildroot}%{_bindir}/%{modname}-3
|
|
|
|
ln -s %{modname}-%{python3_version} %{buildroot}%{_bindir}/%{modname}-3
|
|
|
|
|
|
|
|
|
|
|
|
%if %{with python2}
|
|
|
|
|
|
|
|
ln -sf %{modname}-2 %{buildroot}%{_bindir}/%{modname}
|
|
|
|
|
|
|
|
%else
|
|
|
|
|
|
|
|
ln -sf %{modname}-3 %{buildroot}%{_bindir}/%{modname}
|
|
|
|
ln -sf %{modname}-3 %{buildroot}%{_bindir}/%{modname}
|
|
|
|
%endif # with python2
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
%check
|
|
|
|
export LC_ALL=C.UTF-8
|
|
|
|
%pytest
|
|
|
|
%if %{with python2}
|
|
|
|
|
|
|
|
PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python2_version} -v
|
|
|
|
|
|
|
|
%endif # with python2
|
|
|
|
|
|
|
|
PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v || :
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%if %{with python2}
|
|
|
|
|
|
|
|
%files -n python2-%{modname}
|
|
|
|
|
|
|
|
%license LICENSE
|
|
|
|
|
|
|
|
%doc CHANGES README
|
|
|
|
|
|
|
|
%{_bindir}/%{modname}-2
|
|
|
|
|
|
|
|
%{_bindir}/%{modname}-%{python2_version}
|
|
|
|
|
|
|
|
%{python2_sitelib}/%{srcname}-*.egg-info/
|
|
|
|
|
|
|
|
%{python2_sitelib}/%{modname}/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%files -n python3-%{modname}
|
|
|
|
|
|
|
|
%license LICENSE.rst
|
|
|
|
|
|
|
|
%doc CHANGES.rst README.rst
|
|
|
|
%{_bindir}/%{modname}
|
|
|
|
%{_bindir}/%{modname}
|
|
|
|
%endif # with python2
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%files -n python%{python3_pkgversion}-%{modname}
|
|
|
|
|
|
|
|
%license LICENSE
|
|
|
|
|
|
|
|
%doc CHANGES README
|
|
|
|
|
|
|
|
%{_bindir}/%{modname}-3
|
|
|
|
%{_bindir}/%{modname}-3
|
|
|
|
%{_bindir}/%{modname}-%{python3_version}
|
|
|
|
%{_bindir}/%{modname}-%{python3_version}
|
|
|
|
%{python3_sitelib}/%{srcname}-*.egg-info/
|
|
|
|
%{python3_sitelib}/%{srcname}-*.egg-info/
|
|
|
|
%{python3_sitelib}/%{modname}/
|
|
|
|
%{python3_sitelib}/%{modname}/
|
|
|
|
|
|
|
|
|
|
|
|
%if %{without python2}
|
|
|
|
|
|
|
|
%{_bindir}/%{modname}
|
|
|
|
|
|
|
|
%endif # without python2
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%files doc
|
|
|
|
%files doc
|
|
|
|
%license LICENSE
|
|
|
|
%license LICENSE.rst
|
|
|
|
%doc docs/_build/html examples
|
|
|
|
%doc examples
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
* Thu Nov 07 2019 Brian C. Lane <bcl@redhat.com> - 0.12.2-4
|
|
|
|
* Sat Oct 05 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.0.3-1R.1
|
|
|
|
- Add upstream changes from 0.12.4
|
|
|
|
- Rebuilt for MSVSphere 9.4
|
|
|
|
Resolves: rhbz#1585318
|
|
|
|
|
|
|
|
- Add TestJSON to the gating test from upstream
|
|
|
|
* Tue Jul 26 2022 Troy Dawson <tdawson@redhat.com> - 2.0.3-1.1
|
|
|
|
Related: rhbz#1585318
|
|
|
|
- Set jinja2 dependency to 2.11
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Sep 05 2018 Brian C. Lane <bcl@redhat.com> - 0.12.2-3
|
|
|
|
* Mon Feb 21 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 2.0.3-1
|
|
|
|
- detect UTF encodings when loading json (CVE-2018-1000656)
|
|
|
|
- Update to 2.0.3
|
|
|
|
Resolves: rhbz#1623180
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-2
|
|
|
|
* Wed Jun 20 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:0.12.2-2
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
|
|
- Conditionalize the python2 subpackage
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Nov 10 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 2.0.2-1
|
|
|
|
|
|
|
|
- Update to 2.0.2
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.1-2
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Jun 22 2021 Lumír Balhar <lbalhar@redhat.com> - 2.0.1-1
|
|
|
|
|
|
|
|
- Update to 2.0.1
|
|
|
|
|
|
|
|
Resolves: rhbz#1950465
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1:1.1.2-6
|
|
|
|
|
|
|
|
- Rebuilt for Python 3.10
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.2-5
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.2-4
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 1:1.1.2-3
|
|
|
|
|
|
|
|
- Rebuilt for Python 3.9
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Apr 08 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1:1.1.2-2
|
|
|
|
|
|
|
|
- Simplify packaging
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Apr 03 2020 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 1:1.1.2-1
|
|
|
|
|
|
|
|
- Update to 1.1.2 (#1820730)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.1-2
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Jan 07 2020 Miro Hrončok <mhroncok@redhat.com> - 1:1.1.1-1
|
|
|
|
|
|
|
|
- Update to 1.1.1 (#1711414)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Oct 30 2019 Miro Hrončok <mhroncok@redhat.com> - 1:1.0.2-9
|
|
|
|
|
|
|
|
- Obsolete proper version of python2-flask to fix an upgrade path issue (#1767198)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Sep 18 2019 Miro Hrončok <mhroncok@redhat.com> - 1:1.0.2-8
|
|
|
|
|
|
|
|
- Subpackage python2-flask has been removed
|
|
|
|
|
|
|
|
See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Sat Aug 17 2019 Miro Hrončok <mhroncok@redhat.com> - 1:1.0.2-7
|
|
|
|
|
|
|
|
- Rebuilt for Python 3.8
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.2-6
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Mar 08 2019 François Cami <fcami@fedoraproject.org> - 1:1.0.2-5
|
|
|
|
|
|
|
|
- Remove python2-sphinx dependency since it's not used anymore.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.2-4
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.2-3
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.0.2-2
|
|
|
|
|
|
|
|
- Rebuilt for Python 3.7
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Jun 01 2018 Ken Dreyer <ktdreyer@ktdreyer.com> 1:1.0.2-1
|
|
|
|
|
|
|
|
- Update to 1.0.2 (rhbz#1572414)
|
|
|
|
|
|
|
|
- Do not build Sphinx docs (pallet-sphinx-themes not available)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Apr 27 2018 Ricky Elrod <relrod@redhat.com> - 1:1.0-1
|
|
|
|
|
|
|
|
- new version
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Feb 15 2018 itamar <itamar@ispbrasil.com.br> - 1:0.12.2-1
|
|
|
|
* Thu Feb 15 2018 itamar <itamar@ispbrasil.com.br> - 1:0.12.2-1
|
|
|
|
- new version
|
|
|
|
- new version
|
|
|
|