[python-pyramid/el6] Apply requires for packages based on where package is being installed on (rhel or elsewhere)

[Tomas Dabasinskas]

commit 2186445478fe43fde750a56e1549779b7272647f
Author: Tomas Dabasinskas <tomas at redhat.com>
Date:   Wed Oct 3 00:39:45 2012 +1000

    Apply requires for packages based on where package is being installed on (rhel or elsewhere)

 python-pyramid.spec |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/python-pyramid.spec b/python-pyramid.spec
index 6b78f85..9c61cd8 100644
--- a/python-pyramid.spec
+++ b/python-pyramid.spec
@@ -16,7 +16,7 @@ BuildArch:      noarch
 # 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
+%if 0%{?rhel} && 0%{?rhel} <= 6
 Patch1:         %{name}-reqs.patch
 %endif
 
@@ -31,7 +31,6 @@ BuildRequires:  python-chameleon >= 1.2.3
 BuildRequires:  python-mako >= 0.3.6
 BuildRequires:  python-paste > 1.7
 BuildRequires:  python-paste-deploy
-BuildRequires:  python-paste-script >= 1.7.4
 BuildRequires:  python-setuptools
 BuildRequires:  python-zope-component >= 3.6.0
 BuildRequires:  python-zope-interface >= 3.5.1
@@ -45,7 +44,6 @@ Requires:       python-chameleon >= 1.2.3
 Requires:       python-mako >= 0.3.6
 Requires:       python-paste > 1.7
 Requires:       python-paste-deploy
-Requires:       python-paste-script >= 1.7.4
 Requires:       python-setuptools
 Requires:       python-zope-component >= 3.6.0
 Requires:       python-zope-interface >= 3.5.1
@@ -55,13 +53,17 @@ Requires:       python-repoze-lru
 Requires:       python-zope-configuration
 Requires:       python-zope-deprecation
 
-# Handle python-webob package name for rhel
-%if 0%{?rhel} && 0%{?rhel} < 6
+# Handle python-webob and python-paste-script packages for rhel
+%if 0%{?rhel} && 0%{?rhel} <= 6
 BuildRequires:  python-webob1.2
 Requires:       python-webob1.2
+BuildRequires:  python-paste-script >= 1.7.3
+Requires:       python-paste-script >= 1.7.3
 %else
 BuildRequires:  python-webob >= 1.0.2
 Requires:       python-webob >= 1.0.2
+BuildRequires:  python-paste-script >= 1.7.4
+Requires:       python-paste-script >= 1.7.4
 %endif
 
 
@@ -74,7 +76,7 @@ fun, more predictable, and more productive.
 %setup -q -n pyramid-%{version}
 %patch0 -b .testreqs
 # apply requires patch if running on rhel
-%if 0%{?rhel} && 0%{?rhel} < 6
+%if 0%{?rhel} && 0%{?rhel} <= 6
 %patch1 -b .reqs
 %endif