diff --git a/python-tw2-forms.spec b/python-tw2-forms.spec index 693ed1c..85572ab 100644 --- a/python-tw2-forms.spec +++ b/python-tw2-forms.spec @@ -4,7 +4,7 @@ Name: python-tw2-forms Version: 2.1.4.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Forms for ToscaWidgets2 Group: Development/Languages @@ -18,7 +18,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 @@ -33,6 +33,7 @@ BuildRequires: python-BeautifulSoup BuildRequires: python-formencode BuildRequires: python-webtest BuildRequires: python-strainer +BuildRequires: python-sieve # Templating languages for the test suite BuildRequires: python-mako @@ -55,7 +56,7 @@ tw2.forms contains the basic form widgets. %setup -q -n %{modname}-%{version} %patch0 -p1 -%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 @@ -75,7 +76,6 @@ 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 @@ -86,6 +86,9 @@ rm setup.cfg %changelog +* Mon Apr 28 2014 Ralph Bean - 2.1.4.1-7 +- Try to fix deps busted by releng. + * Mon Apr 28 2014 Ralph Bean - 2.1.4.1-6 - Backported patch to fix buttons.