[python-pyramid: 7/7] Update to pyramid-1.4b1.

[Ralph Bean]

commit 5aeadd9f2b8ef8315086851884bd21ac7c069493
Author: Ralph Bean <rbean at redhat.com>
Date:   Mon Dec 10 15:50:59 2012 -0500

    Update to pyramid-1.4b1.

 .gitignore                    |    1 +
 python-pyramid-reqs.patch     |   11 ------
 python-pyramid-testreqs.patch |   10 -----
 python-pyramid.spec           |   74 +++++++++++++++++++++--------------------
 sources                       |    2 +-
 5 files changed, 40 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 65f702d..11955b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 pyramid-1.0.tar.gz
 /pyramid-1.1.2.tar.gz
 /pyramid-1.2.7.tar.gz
+/pyramid-1.4b1.tar.gz
diff --git a/python-pyramid.spec b/python-pyramid.spec
index 5a640ce..a4c3647 100644
--- a/python-pyramid.spec
+++ b/python-pyramid.spec
@@ -1,8 +1,8 @@
 %global modname pyramid
 
 Name:           python-%{modname}
-Version:        1.2.7
-Release:        6%{?dist}
+Version:        1.4b1
+Release:        1%{?dist}
 Summary:        The Pyramid web application framework, a Pylons project
 
 Group:          Development/Libraries
@@ -12,63 +12,58 @@ Source0:        http://pypi.python.org/packages/source/p/pyramid/%{modname}-%{ve
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-# Remove testing requirement repoze.sphinx.autointerface until it is packaged.
-# It's not necessary for the test suite to run properly.
-Patch0:         %{name}-testreqs.patch
-# Change requires version for python-paste-script on rhel
-%if 0%{?rhel} && 0%{?rhel} <= 6
-Patch1:         %{name}-reqs.patch
-%endif
-
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools-devel
-BuildRequires:  python-webtest
 BuildRequires:  python-virtualenv
 BuildRequires:  python-docutils
 BuildRequires:  python-sphinx
 
 BuildRequires:  python-chameleon >= 1.2.3
 BuildRequires:  python-paste > 1.7
-BuildRequires:  python-paste-deploy
 BuildRequires:  python-setuptools
 BuildRequires:  python-zope-component >= 3.6.0
-BuildRequires:  python-zope-interface >= 3.5.1
 BuildRequires:  python-translationstring
 BuildRequires:  python-venusian >= 1.0
 BuildRequires:  python-repoze-lru
 BuildRequires:  python-zope-configuration
-BuildRequires:  python-zope-deprecation
+BuildRequires:  python-zope-deprecation >= 3.5.0
 
 Requires:       python-chameleon >= 1.2.3
 Requires:       python-paste > 1.7
-Requires:       python-paste-deploy
 Requires:       python-setuptools
 Requires:       python-zope-component >= 3.6.0
-Requires:       python-zope-interface >= 3.5.1
 Requires:       python-translationstring
 Requires:       python-venusian >= 1.0
 Requires:       python-repoze-lru
 Requires:       python-zope-configuration
-Requires:       python-zope-deprecation
+Requires:       python-zope-deprecation >= 3.5.0
 
-# Handle python-webob and python-paste-script packages for rhel
-%if 0%{?rhel} && 0%{?rhel} <= 6
 BuildRequires:  python-webob1.2
 Requires:       python-webob1.2
+
+# Handle forwards-compat packages for rhel/el6
+%if 0%{?rhel} && 0%{?rhel} <= 6
+BuildRequires:  python-webtest1.3
 BuildRequires:  python-paste-script >= 1.7.3
 Requires:       python-paste-script >= 1.7.3
 BuildRequires:  python-mako0.4
 Requires:       python-mako0.4
+BuildRequires:  python-zope-interface4
+Requires:       python-zope-interface4
+BuildRequires:  python-paste-deploy1.5
+Requires:       python-paste-deploy1.5
 %else
-BuildRequires:  python-webob >= 1.0.2
-Requires:       python-webob >= 1.0.2
+BuildRequires:  python-webtest
 BuildRequires:  python-paste-script >= 1.7.4
 Requires:       python-paste-script >= 1.7.4
 BuildRequires:  python-mako >= 0.3.6
 Requires:       python-mako >= 0.3.6
+BuildRequires:  python-zope-interface >= 3.8.0
+Requires:       python-zope-interface >= 3.8.0
+BuildRequires:  python-paste-deploy >= 1.5.0
+Requires:       python-paste-deploy >= 1.5.0
 %endif
 
-
 %description
 Pyramid is a small, fast, down-to-earth, open source Python web development
 framework. It makes real-world web application development and deployment more
@@ -76,34 +71,41 @@ fun, more predictable, and more productive.
 
 %prep
 %setup -q -n pyramid-%{version}
-%patch0 -b .testreqs
-# apply requires patch if running on rhel
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%patch1 -b .reqs
-%endif
+
+# Force that a certain version of webob is imported and not the older one.
+awk 'NR==1{print "import __main__; __main__.__requires__ = __requires__ = [\"WebOb==1.2.1\", \"PasteDeploy==1.5.0\", \"WebTest==1.3.4\"]; import pkg_resources"}1' setup.py > setup.py.tmp
+mv setup.py.tmp setup.py
 
 %build
 %{__python} setup.py build
 
 %install
-rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
-#Disabled because 1.2.7 has unit tests that return false negatives
-#%check
-#%{__python} setup.py test
-#%{__rm} -r %{buildroot}%{python_sitelib}/pyramid/tests
-
-%clean
-rm -rf %{buildroot}
+%check
+%{__python} setup.py test
 
 %files
-%defattr(-,root,root,-)
 %doc README.rst LICENSE.txt
 %{python_sitelib}/*
 %{_bindir}/bfg2pyramid
+%{_bindir}/pcreate
+%{_bindir}/pserve
+%{_bindir}/prequest
+%{_bindir}/proutes
+%{_bindir}/pshell
+%{_bindir}/ptweens
+%{_bindir}/pviews
 
 %changelog
+* Wed Nov 28 2012 Ralph Bean <rbean at redhat.com> - 1.4b1-1
+- Latest upstream.
+- Removed unnecessary defattr and clean section.
+- Re-enabled test suite/check section.
+- Removed old patch.
+- Depend on and force python-webob1.2
+- A bunch of new _bindir tools.
+
 * Wed Oct 10 2012 Tomas Dabasinskas <tomas at redhat.com> - 1.2.7-6
 - Changed python-mako requires. 
   For rhel python-mako0.4, else python-mako >= 0.3.6
diff --git a/sources b/sources
index 6157678..39a1028 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53aa6a19d3e5755732145553e2d67e78  pyramid-1.2.7.tar.gz
+c347a8cf81a2a2d6d6b4a5ba18b236c0  pyramid-1.4b1.tar.gz