From 2e26ac55f2c8460bddaa70e3e439d2708269a157 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Apr 28 2014 14:12:48 +0000
Subject: Merge branch 'epel7'


Conflicts:
	python-tw2-forms.spec

---

diff --git a/python-tw2-forms.spec b/python-tw2-forms.spec
index 9c99d79..5366dee 100644
--- a/python-tw2-forms.spec
+++ b/python-tw2-forms.spec
@@ -16,11 +16,7 @@ BuildArch:      noarch
 # For building, generally
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
-%if %{?rhel}%{!?rhel:0} >= 6
-BuildRequires:  python-webob1.0 >= 0.9.7
-%else
 BuildRequires:  python-webob >= 0.9.7
-%endif
 BuildRequires:  python-tw2-core >= 2.1.4
 BuildRequires:  python-paste-deploy
 
@@ -52,19 +48,6 @@ tw2.forms contains the basic form widgets.
 %prep
 %setup -q -n %{modname}-%{version}
 
-%if %{?rhel}%{!?rhel:0} >= 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
-
-sed -i 's|Jinja2|jinja2|g' setup.py
-
-# Remove all the fancy nosetests configuration for older python
-rm setup.cfg
-
-%endif
-
 %build
 %{__python} setup.py build
 
@@ -72,6 +55,7 @@ rm setup.cfg
 %{__python} setup.py install -O1 --skip-build \
     --install-data=%{_datadir} --root %{buildroot}
 
+# Disable tests since they are failing for epel7
 #%check
 #PYTHONPATH=$(pwd) python setup.py test
 
@@ -87,6 +71,7 @@ rm setup.cfg
 
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.4.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+- Disable tests for epel7.
 
 * Thu Feb 28 2013 Ralph Bean <rbean@redhat.com> - 2.1.4.1-3
 - Rename Jinja2 to jinja2 for el6.