[python-falcon/el6: 2/2] Removed python3 code and patches
Jamie Lennox
jamielennox at fedoraproject.org
Fri Oct 4 02:25:55 UTC 2013
commit 5f41ae8b81b4e908d9e96172b3524c08f3bf990d
Author: Jamie Lennox <jamielennox at redhat.com>
Date: Fri Oct 4 12:25:10 2013 +1000
Removed python3 code and patches
These won't work on el6.
python-falcon.spec | 80 ++++++----------------------------------------------
1 files changed, 9 insertions(+), 71 deletions(-)
---
diff --git a/python-falcon.spec b/python-falcon.spec
index 9d1906a..c87750d 100644
--- a/python-falcon.spec
+++ b/python-falcon.spec
@@ -1,7 +1,3 @@
-%if 0%{?fedora} > 12 || 0%{?rhel} > 6
-%global with_python3 1
-%endif
-
Name: python-falcon
Version: 0.1.7
Release: 1%{?dist}
@@ -11,14 +7,12 @@ License: ASL 2.0
Group: Development/Libraries
URL: http://falconframework.org
Source0: https://pypi.python.org/packages/source/f/falcon/falcon-%{version}.tar.gz
-Patch0: 0001-Make-loading-description-python-independent.patch
-Patch1: 0002-Add-output-encoding-to-tests-for-Python3.patch
Requires: python-six
Requires: python-mimeparse
BuildRequires: Cython
-BuildRequires: python2-devel
+BuildRequires: python-devel
BuildRequires: python-nose
BuildRequires: python-requests
BuildRequires: python-setuptools
@@ -39,88 +33,32 @@ Features:
- Python 2.6, Python 2.7, PyPy and Python 3.3 support
- Speed, speed, and more speed!
-%if 0%{?with_python3}
-%package -n python3-falcon
-Summary: A supersonic micro-framework for building cloud APIs
-Requires: python3-mimeparse
-Requires: python3-six
-
-BuildRequires: python3-Cython
-BuildRequires: python3-devel
-BuildRequires: python3-nose
-BuildRequires: python3-requests
-BuildRequires: python3-setuptools
-BuildRequires: python3-testtools
-
-%description -n python3-falcon
-Falcon is a high-performance Python framework for building cloud APIs.
-It encourages the REST architectural style, and tries to do as little as
-possible while remaining highly effective.
-
-Features:
-- Intuitive routing via URI templates and resource classes
-- Easy access to headers and bodies through request and response classes
-- Idiomatic HTTP error responses via a handy exception base class
-- DRY request processing using global, resource, and method hooks
-- Snappy unit testing through WSGI helpers and mocks
-- 20% speed boost when Cython is available
-- Python 2.6, Python 2.7, PyPy and Python 3.3 support
-- Speed, speed, and more speed!
-%endif
-
%prep
%setup -q -n falcon-%{version}
%patch0 -p1
%patch1 -p1
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif
-
%build
-CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py build
-
-%if 0%{?with_python3}
-pushd %{py3dir}
-CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
-popd
-%endif
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
%install
-%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-popd
-%endif
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
# don't package the benchmark test
rm $RPM_BUILD_ROOT/%{_bindir}/falcon-bench
%check
-%{__python2} setup.py test
-
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py test
-popd
-%endif
+%{__python} setup.py test
%files
%doc AUTHORS CHANGES.md LICENSE NOTES.md README.rst
-%{python2_sitearch}/falcon
-%{python2_sitearch}/falcon-%{version}-py?.?.egg-info
-
-%if 0%{?with_python3}
-%files -n python3-falcon
-%doc AUTHORS CHANGES.md LICENSE NOTES.md README.rst
-%{python3_sitearch}/falcon
-%{python3_sitearch}/falcon-%{version}-py?.?.egg-info
-%endif
+%{python_sitearch}/falcon
+%{python_sitearch}/falcon-%{version}-py?.?.egg-info
%changelog
+* Fri Oct 04 2013 Jamie Lennox <jamielennox at redhat.com> - 0.1.7-1
+- Removed python 2 and 3 specific setup for el6.
+
* Mon Sep 23 2013 Jamie Lennox <jamielennox at redhat.com> - 0.1.7-1
- Add Python 3 packaging details and patch to fix for Python 3.
- Remove falcon-bench from package.
More information about the scm-commits
mailing list