[python-waitress] Remove python3 dependency on the python-waitress python2 package

Lorenzo Gil Sánchez lgs at fedoraproject.org
Sun Dec 8 18:05:08 UTC 2013


commit c40d74bcc1d01062e5a97c8aadc3d35ad0cd999e
Author: Lorenzo Gil Sanchez <lorenzo.gil.sanchez at gmail.com>
Date:   Sun Dec 8 10:04:58 2013 -0800

    Remove python3 dependency on the python-waitress python2 package

 python-waitress.spec |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/python-waitress.spec b/python-waitress.spec
index 1315f7c..2096388 100644
--- a/python-waitress.spec
+++ b/python-waitress.spec
@@ -2,7 +2,7 @@
 
 Name:           python-waitress
 Version:        0.8.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Waitress WSGI server
 
 License:        ZPLv2.1
@@ -66,12 +66,14 @@ pushd %{py3dir}
 popd
 
 %install
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
-
+# Run the Python 3 install first so that the Python 2 version
+# of /usr/bin/waitress-server "wins":
 pushd %{py3dir}
 %{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT
 popd
 
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
 
 %check
 # by setting the PYTHONPATH to the current dir
@@ -85,7 +87,7 @@ pushd %{py3dir}
 PYTHONPATH=. %{__python3} setup.py test -q
 popd
 
- 
+
 %files
 %doc README.rst CHANGES.txt COPYRIGHT.txt LICENSE.txt docs
 %{_bindir}/waitress-serve
@@ -94,13 +96,15 @@ popd
 
 %files -n python3-waitress
 %doc README.rst CHANGES.txt COPYRIGHT.txt LICENSE.txt docs
-%{_bindir}/waitress-serve
 %{python3_sitelib}/waitress
 %{python3_sitelib}/waitress-%{version}-py3.?.egg-info
 
 
 %changelog
 
+* Sun Dec 8 2013 Lorenzo Gil Sanchez <lorenzo.gil.sanchez at gmail.com> - 0.8.5-3
+- Remove python3 dependency on the python-waitress python2 package
+
 * Wed Aug 7 2013 Lorenzo Gil Sanchez <lorenzo.gil.sanchez at gmail.com> - 0.8.5-2
 - Update description to use the new Fedora 20 _pkgdocdir macro, which
   is also defined for backwards cmompatibility


More information about the scm-commits mailing list