From 8afb6bf3ad421c6513c2d5ef5f51d7308edd07a3 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Mar 15 2014 00:40:48 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora


Conflicts:
	python-fedora.spec

---

diff --git a/python-fedora.spec b/python-fedora.spec
index 1a1906c..1962493 100644
--- a/python-fedora.spec
+++ b/python-fedora.spec
@@ -6,7 +6,7 @@
 
 Name:           python-fedora
 Version:        0.3.33
-Release:        1%{?dist}.1
+Release:        3%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
@@ -23,11 +23,14 @@ BuildRequires:  python-sphinx10
 %else
 BuildRequires:  python-sphinx
 %endif
-%if 0%{?fedora} || 0%{?rhel} > 5
+%if 0%{?fedora} || (0%{?rhel} == 6)
 BuildRequires:  python-cherrypy2
 %else
+# Do not need TurboGears1 dependencies on epel7
+%if 0%{?rhel} < 7
 BuildRequires:  python-cherrypy
 %endif
+%endif
 BuildRequires:  python-babel
 BuildRequires:  TurboGears2
 BuildRequires:  python-nose
@@ -35,7 +38,7 @@ BuildRequires:  python-kitchen
 BuildRequires:  python-bunch
 # Needed for tests and for the way we build docs
 %if 0%{?rhel} < 7
-# Phasing this out.  First from epel7 and later for all releases
+# Phasing this out.  First from epel7 and later for everything
 BuildRequires: TurboGears
 %endif
 BuildRequires: python-repoze-who-friendlyform Django
@@ -86,10 +89,12 @@ License:        LGPLv2+
 Requires: %{name} = %{version}-%{release}
 Requires: TurboGears2
 Requires: python-sqlalchemy
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 Requires: python-mako >= 0.3.6
-%else if 0%{?rhel} && 0%{?rhel} <= 6
-Requires: python-mako0.4 >= 0.3.6
+%else
+%if 0%{?rhel} <= 6
+Requires: python-mako0.4
+%endif
 %endif
 Requires: python-repoze-who-friendlyform
 
@@ -184,10 +189,14 @@ rm -rf %{buildroot}
 %{python2_sitelib}/flask_fas_openid.py*
 
 %changelog
-* Fri Mar 14 2014 Toshio Kuratomi <toshio@fedoraproject.org> - 0.3.33-1.1
+* Fri Mar 14 2014 Toshio Kuratomi <toshio@fedoraproject.org> - 0.3.33-3
 - Do not build the TG1 subpackage on EPEL7.  Infrastructure is going to port
   its applications away from TG1 by the time they switch to RHEL7.  So we want
   to get rid of TurboGears1 packages before RHEL7.
+- Fix conditionals so that they include the proper packages on epel7
+
+* Fri Jan 10 2014 Dennis Gilmore <dennis@ausil.us> - 0.3.33-2
+- clean up some rhel logic in the spec
 
 * Thu Dec 19 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 0.3.33-1
 - Update for final release with numerous flask_fas_openid fixes