diff --git a/.gitignore b/.gitignore index c53743c..a8903c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/waitress-0.8.2.tar.gz -/waitress-0.8.3.tar.gz -/waitress-0.8.4.tar.gz -/waitress-0.8.5.tar.gz -/waitress-0.8.8.tar.gz -/waitress-0.8.9.tar.gz +/waitress-*-nodocs.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..a60d365 --- /dev/null +++ b/changelog @@ -0,0 +1,208 @@ +* Fri Jan 26 2024 Fedora Release Engineering - 2.1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 2.1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 2.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 2.1.2-4 +- Rebuilt for Python 3.12 + +* Wed May 10 2023 Carl George - 2.1.2-3 +- Convert to pyproject macros +- Run test suite +- Switch to SPDX license identifier + +* Fri Jan 20 2023 Fedora Release Engineering - 2.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Aug 02 2022 Alfredo Moralejo - 2.1.2-1 +- Update to 2.1.2 Fixes rhbz#2091729 + +* Fri Jul 22 2022 Fedora Release Engineering - 2.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 2.1.1-2 +- Rebuilt for Python 3.11 + +* Mon May 30 2022 Kevin Fenzi - 2.1.1-1 +- Update to 2.1.1. Fixes rhbz#2051348 + +* Fri Jan 21 2022 Fedora Release Engineering - 1.4.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 03 2021 Python Maint - 1.4.4-4 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 15 2021 Troy Dawson - 1.4.4-2 +- Remove test BuildRequires until tests are working + +* Thu Sep 10 2020 Joel Capitao - 1.4.4-1 +- Update to 1.4.4 + +* Wed Jul 29 2020 Fedora Release Engineering - 1.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat May 23 2020 Miro Hrončok - 1.4.3-2 +- Rebuilt for Python 3.9 + +* Fri Feb 07 2020 Lorenzo Gil Sanchez - 1.4.3-1 +- Update to 1.4.3 Fixes bug #1785591 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 20 2020 Lorenzo Gil Sanchez - 1.4.2-1 +- Update to 1.4.2 Fixes bugs #1785591 #1789807 #1789809 #1789810 #1791415 + #1791416 #1791417 #1791420 #1791421 #1791422 #1791423 + +* Thu Jan 16 2020 Lorenzo Gil Sanchez - 1.4.1-1 +- Update to 1.4.1 Fixes bug #1785591 + +* Wed Dec 25 2019 Lorenzo Gil Sanchez - 1.4.0-1 +- Update to 1.4.0 Fixes bug #1785591 + +* Sun Oct 06 2019 Kevin Fenzi - 1.3.1-1 +- Update to 1.3.1. Fixes bug #1747075 + +* Mon Sep 09 2019 Miro Hrončok - 1.2.1-5 +- Subpackage python2-waitress has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Sat Aug 17 2019 Miro Hrončok - 1.2.1-4 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Jun 29 2019 Kevin Fenzi - 1.2.1-2 +- Remove non free docs from src.rpm and provide script to do so before upload. +- Fixes bug #1684335 + +* Tue Feb 05 2019 Lorenzo Gil Sanchez - 1.2.1-1 +- Update to 1.2.1 (#1667466) + +* Sat Feb 02 2019 Fedora Release Engineering - 1.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Jun 17 2018 Miro Hrončok - 1.1.0-3 +- Rebuilt for Python 3.7 + +* Fri Feb 09 2018 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Nov 11 2017 Lorenzo Gil Sanchez - 1.1.0-1 +- Update to 1.1.0 (#1504455) + +* Thu Jul 27 2017 Fedora Release Engineering - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 18 2017 Lorenzo Gil Sanchez - 1.0.2-1 +- Update to 1.0.2. Fixes bug #1419297 + +* Sat Feb 11 2017 Fedora Release Engineering - 1.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 1.0.1-2 +- Rebuild for Python 3.6 + +* Tue Oct 25 2016 Kevin Fenzi - 1.0.1-1 +- Update to 1.0.1. Fixes bug #1387885 + +* Sat Sep 03 2016 Kevin Fenzi - 1.0.0-1 +- Update to 1.0.0. Fixes bug #1372330 + +* Tue Jul 19 2016 Fedora Release Engineering - 0.9.0-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Jun 29 2016 Igor Gnatenko - 0.9.0-3 +- Modernize spec to comply with new packaging guidelines + +* Thu May 26 2016 Lorenzo Gil Sanchez - 0.9.0-2 +- Fixed Source0 to point to new PyPi predictable URL format + +* Thu May 5 2016 Lorenzo Gil Sanchez - 0.9.0-1 +- Update to 0.9.0 +- Fixed 2 warnings from fedpkg lint + +* Sun Apr 10 2016 Kevin Fenzi - 0.9.0b1-1 +- Update to 0.9.0b1. Fixes bug #1325661 + +* Mon Mar 21 2016 Lorenzo Gil Sanchez - 0.9.0b0-1 +- New (beta) version + +* Thu Feb 04 2016 Fedora Release Engineering - 0.8.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 0.8.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Wed Sep 16 2015 Ralph Bean - 0.8.10-1 +- new version + +* Thu Jun 18 2015 Fedora Release Engineering - 0.8.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Apr 27 2015 Ralph Bean - 0.8.9-5 +- Conditionalize the python3 subpackage. + +* Mon Jul 14 2014 Lorenzo Gil Sanchez - 0.8.9-4 +- Fix comment in description section about versioned directory for docs +- Use __python2 macro instead of __python + +* Sat Jun 14 2014 Lorenzo Gil Sanchez - 0.8.9-3 +- Run the tests with nose to avoid unclosed socket errors + +* Sun Jun 08 2014 Fedora Release Engineering - 0.8.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun May 25 2014 Lorenzo Gil Sanchez - 0.8.9-1 +- Update to upstream + +* Wed May 14 2014 Bohuslav Kabrda - 0.8.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + +* Sun Dec 22 2013 Lorenzo Gil Sanchez - 0.8.8-1 +- Update to upstream + +* Sun Dec 8 2013 Lorenzo Gil Sanchez - 0.8.5-3 +- Remove python3 dependency on the python-waitress python2 package + +* Wed Aug 7 2013 Lorenzo Gil Sanchez - 0.8.5-2 +- Update description to use the new Fedora 20 _pkgdocdir macro, which + is also defined for backwards cmompatibility + +* Wed Jul 31 2013 Lorenzo Gil Sanchez - 0.8.5-1 +- Update to upstream + +* Sat Jul 6 2013 Lorenzo Gil Sanchez - 0.8.4-1 +- Update to upstream +- Added waitress-serve as a binary executable in /usr/bin + +* Sun May 12 2013 Lorenzo Gil Sanchez - 0.8.3-1 +- Update to upstream + +* Thu Feb 14 2013 Fedora Release Engineering - 0.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Nov 28 2012 Lorenzo Gil Sanchez - 0.8.2-3 +- Use version macro in the Source0 to avoid duplicates +* Sat Nov 24 2012 Lorenzo Gil Sanchez - 0.8.2-2 +- Point to the local docs directory in the description for the documentation +- Remove py3dir before copying the files to it in the prep phase +- Remove -O1 in the build phase as it is not used anymore in the Fedora + Packaging guidelines +- Remove files rpmlint doesn't like +* Mon Nov 19 2012 Lorenzo Gil Sanchez - 0.8.2-1 +- New package. diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..d6b0ffa --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +if [[ $# -ne 1 ]]; then + echo "usage: $(basename $0) " + exit 1 +fi + +VERSION=$1 + +wget https://github.com/Pylons/waitress/archive/v$VERSION/waitress-$VERSION.tar.gz +tar -xzvf waitress-$VERSION.tar.gz +rm -rf waitress-$VERSION/docs +mv waitress-$VERSION waitress-$VERSION-nodocs +tar -czvf waitress-$VERSION-nodocs.tar.gz waitress-$VERSION-nodocs diff --git a/python-waitress.spec b/python-waitress.spec index eecb4f9..dd52e38 100644 --- a/python-waitress.spec +++ b/python-waitress.spec @@ -1,171 +1,62 @@ -%if 0%{?fedora} -%global with_python3 1 -%endif - -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - Name: python-waitress -Version: 0.8.9 -Release: 5%{?dist} +Version: 3.0.2 +Release: %autorelease Summary: Waitress WSGI server -License: ZPLv2.1 +License: ZPL-2.1 URL: https://github.com/Pylons/waitress -Source0: http://pypi.python.org/packages/source/w/waitress/waitress-%{version}.tar.gz -#md5=da3f2e62b3676be5dd630703a68e2a04 +Source0: waitress-%{version}-nodocs.tar.gz +# Upstream ships non free docs files. +# +# https://github.com/Pylons/waitress/issues/78 +# +# We do not even want them in our src.rpms +# So we remove them before uploading. +# +# Download the upstream tarball and invoke this script while in the +# tarball's directory: +# ./generate-tarball.sh 1.0 +# +Source1: generate-tarball.sh BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python-setuptools -BuildRequires: python-nose -BuildRequires: python-coverage -BuildRequires: python-sphinx -%description -Waitress is meant to be a production-quality pure-Python WSGI server with -very acceptable performance. It has no dependencies except ones which live -in the Python standard library. It runs on CPython on Unix and Windows under -Python 2.6+ and Python 3.2. It is also known to run on PyPy 1.6.0 on UNIX. -It supports HTTP/1.0 and HTTP/1.1. +%global _description %{expand: +Waitress is a production-quality pure-Python WSGI server with very acceptable +performance. It has no dependencies except ones which live in the Python +standard library.} -For more information, see %{_pkgdocdir}/docs or -http://docs.pylonsproject.org/projects/waitress/en/latest/ . +%description %{_description} -%if 0%{?with_python3} %package -n python3-waitress -Summary: Waitress WSGI server -Requires: python3 -BuildArch: noarch +Summary: %{summary} BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-nose -BuildRequires: python3-coverage -BuildRequires: python3-sphinx -%description -n python3-waitress -Waitress is meant to be a production-quality pure-Python WSGI server with -very acceptable performance. It has no dependencies except ones which live -in the Python standard library. It runs on CPython on Unix and Windows under -Python 2.6+ and Python 3.2. It is also known to run on PyPy 1.6.0 on UNIX. -It supports HTTP/1.0 and HTTP/1.1. - -For more information, see %{_pkgdocdir}/docs or -http://docs.pylonsproject.org/projects/waitress/en/latest/ . -%endif +%description -n python3-waitress %{_description} %prep -%setup -q -n waitress-%{version} -rm -rf waitress.egg-info -rm -f .gitignore docs/.gitignore -# this script has devel paths, not useful in a user system -rm -f docs/rebuild - -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif +%autosetup -n waitress-%{version}-nodocs +sed -e '/pytest-cov/d' \ + -e '/coverage/d' \ + -e '/addopts/d' \ + -i setup.cfg +%generate_buildrequires +%pyproject_buildrequires -x testing %build -%{__python2} setup.py build - -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build -popd -%endif +%pyproject_wheel %install -# Run the Python 3 install first so that the Python 2 version -# of /usr/bin/waitress-server "wins": -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT -popd -%endif - -%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT - +%pyproject_install +%pyproject_save_files -l waitress %check -# by setting the PYTHONPATH to the current dir -# we make the package waitress importable -# Usually the testsuite is run after installing -# the package in develop mode but we can't install -# in develop mode here. -PYTHONPATH=. %{__python2} setup.py nosetests +%pytest -%if 0%{?with_python3} -pushd %{py3dir} -PYTHONPATH=. %{__python3} setup.py nosetests -popd -%endif - - -%files -%doc README.rst CHANGES.txt COPYRIGHT.txt LICENSE.txt docs +%files -n python3-waitress -f %{pyproject_files} +%doc README.rst CHANGES.txt %{_bindir}/waitress-serve -%{python2_sitelib}/waitress -%{python2_sitelib}/waitress-%{version}-py2.?.egg-info - -%if 0%{?with_python3} -%files -n python3-waitress -%doc README.rst CHANGES.txt COPYRIGHT.txt LICENSE.txt docs -%{python3_sitelib}/waitress -%{python3_sitelib}/waitress-%{version}-py3.?.egg-info -%endif - %changelog -* Mon Apr 27 2015 Ralph Bean - 0.8.9-5 -- Conditionalize the python3 subpackage. - -* Mon Jul 14 2014 Lorenzo Gil Sanchez - 0.8.9-4 -- Fix comment in %description about versioned directory for docs -- Use __python2 macro instead of __python - -* Sat Jun 14 2014 Lorenzo Gil Sanchez - 0.8.9-3 -- Run the tests with nose to avoid unclosed socket errors - -* Sun Jun 08 2014 Fedora Release Engineering - 0.8.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun May 25 2014 Lorenzo Gil Sanchez - 0.8.9-1 -- Update to upstream - -* Wed May 14 2014 Bohuslav Kabrda - 0.8.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 - -* Sun Dec 22 2013 Lorenzo Gil Sanchez - 0.8.8-1 -- Update to upstream - -* Sun Dec 8 2013 Lorenzo Gil Sanchez - 0.8.5-3 -- Remove python3 dependency on the python-waitress python2 package - -* Wed Aug 7 2013 Lorenzo Gil Sanchez - 0.8.5-2 -- Update description to use the new Fedora 20 _pkgdocdir macro, which - is also defined for backwards cmompatibility - -* Wed Jul 31 2013 Lorenzo Gil Sanchez - 0.8.5-1 -- Update to upstream - -* Sat Jul 6 2013 Lorenzo Gil Sanchez - 0.8.4-1 -- Update to upstream -- Added waitress-serve as a binary executable in /usr/bin - -* Sun May 12 2013 Lorenzo Gil Sanchez - 0.8.3-1 -- Update to upstream - -* Thu Feb 14 2013 Fedora Release Engineering - 0.8.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Nov 28 2012 Lorenzo Gil Sanchez - 0.8.2-3 -- Use %{version} in the Source0 to avoid duplicates -* Sat Nov 24 2012 Lorenzo Gil Sanchez - 0.8.2-2 -- Point to the local docs directory in the description for the documentation -- Remove py3dir before copying the files to it in the prep phase -- Remove -O1 in the build phase as it is not used anymore in the Fedora - Packaging guidelines -- Remove files rpmlint doesn't like -* Mon Nov 19 2012 Lorenzo Gil Sanchez - 0.8.2-1 -- New package. +%autochangelog diff --git a/sources b/sources index 4242f2d..cc9417c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da3f2e62b3676be5dd630703a68e2a04 waitress-0.8.9.tar.gz +SHA512 (waitress-3.0.2-nodocs.tar.gz) = bd200adf775a5f2a64c5b855ae64b7ada191eed91f10265701b404ad026af47c3f9e0b2d07f2615a6f6abcbc01b3ae2eb02d4c978b060b560ce60991d9590435