[python-tw2-core] 2.2.2

[Ralph Bean]

commit e92d5a424a139b727e6fc381a7b9c8b3a616536b
Author: Ralph Bean <rbean at redhat.com>
Date:   Fri Feb 20 12:37:16 2015 -0500

    2.2.2

 .gitignore           |  1 +
 python-tw2-core.spec | 21 ++++++++++++++-------
 sources              |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 946e30d..abef6e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /tw2.core-2.0.5.tar.gz
 /tw2.core-2.1.5.tar.gz
 /tw2.core-2.2.1.1.tar.gz
+/tw2.core-2.2.2.tar.gz
diff --git a/python-tw2-core.spec b/python-tw2-core.spec
index 13a6ba7..e5c1aca 100644
--- a/python-tw2-core.spec
+++ b/python-tw2-core.spec
@@ -4,8 +4,8 @@
 %global modname tw2.core
 
 Name:           python-tw2-core
-Version:        2.2.1.1
-Release:        5%{?dist}
+Version:        2.2.2
+Release:        1%{?dist}
 Summary:        Web widget creation toolkit based on TurboGears widgets
 
 Group:          Development/Languages
@@ -21,7 +21,7 @@ BuildArch:      noarch
 # For building, generally
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
-%if %{?rhel}%{!?rhel:0} <= 6
+%if 0%{?rhel} && 0%{?rhel} <= 6
 BuildRequires:  python-webob1.0 >= 0.9.7
 %else
 BuildRequires:  python-webob >= 0.9.7
@@ -49,13 +49,13 @@ BuildRequires:  python-chameleon
 BuildRequires:  python-kajiki
 BuildRequires:  python-jinja2
 
-%if %{?rhel}%{!?rhel:0} <= 6
+%if 0%{?rhel} && 0%{?rhel} <= 6
 BuildRequires:  python-ordereddict
 Requires:       python-ordereddict
 %endif
 
 # Runtime requirements
-%if %{?rhel}%{!?rhel:0} <= 6
+%if 0%{?rhel} && 0%{?rhel} <= 6
 Requires:       python-webob1.0 >= 0.9.7
 %else
 Requires:       python-webob >= 0.9.7
@@ -78,11 +78,11 @@ development tools are in tw2.devtools.
 %prep
 %setup -q -n %{modname}-%{version}
 
-%if %{?rhel}%{!?rhel:0} <= 6
+%if 0%{?rhel} && 0%{?rhel} <= 6
 %patch0 -p1
 %endif
 
-%if %{?rhel}%{!?rhel:0} <= 6
+%if 0%{?rhel} && 0%{?rhel} <= 6
 # Make sure that epel/rhel picks up the correct version of webob
 awk 'NR==1{print "import __main__; __main__.__requires__ = __requires__ = [\"WebOb>=1.0\"]; import pkg_resources"}1' setup.py > setup.py.tmp
 mv setup.py.tmp setup.py
@@ -108,6 +108,13 @@ PYTHONPATH=$(pwd) python setup.py test
 %{python_sitelib}/%{modname}-%{version}*
 
 %changelog
+* Fri Feb 20 2015 Ralph Bean <rbean at redhat.com> - 2.2.2-1
+- new version
+
+* Fri Feb 20 2015 Ralph Bean <rbean at redhat.com> - 2.2.2-1
+- new version
+- Further fix rhel6 conditionals.
+
 * Thu Nov 13 2014 Ralph Bean <rbean at redhat.com> - 2.2.1.1-5
 - Spec bump to deal with ridiculous epel7 merge.  ;(
 
diff --git a/sources b/sources
index 12e891f..21eb283 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22485c9f3e9b125e263c38fb35256961  tw2.core-2.2.1.1.tar.gz
+0f8e7c7a4e3b65aade5ab37d9174311d  tw2.core-2.2.2.tar.gz