[python-fedora: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora

[Toshio くらとみ]

commit 8afb6bf3ad421c6513c2d5ef5f51d7308edd07a3
Merge: 04ef7f6 bbc139b
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Mar 14 17:40:48 2014 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora
    
    Conflicts:
    	python-fedora.spec

 python-fedora.spec |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)
---
diff --cc python-fedora.spec
index 1a1906c,35c1903..1962493
--- a/python-fedora.spec
+++ b/python-fedora.spec
@@@ -6,7 -6,7 +6,7 @@@
  
  Name:           python-fedora
  Version:        0.3.33
- Release:        1%{?dist}.1
 -Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        Python modules for talking to Fedora Infrastructure Services
  
  Group:          Development/Languages
@@@ -18,27 -18,19 +18,30 @@@ BuildRoot:      %{_tmppath}/%{name}-%{v
  BuildArch:      noarch
  BuildRequires:  python2-devel
  BuildRequires:  python-setuptools
 +%if 0%{?rhel} && 0%{?rhel} <= 6
 +BuildRequires:  python-sphinx10
 +%else
  BuildRequires:  python-sphinx
 -%if 0%{?fedora} || 0%{?rhel} > 5
 +%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
  BuildRequires:  python-kitchen
  BuildRequires:  python-bunch
  # Needed for tests and for the way we build docs
 -BuildRequires: TurboGears python-repoze-who-friendlyform Django
 +%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
  BuildRequires: python-requests
  BuildRequires: python-openid
  BuildRequires: python-openid-teams
@@@ -86,11 -76,7 +89,13 @@@ 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
  
  %description turbogears2
@@@ -184,10 -168,8 +189,14 @@@ rm -rf %{buildroot
  %{python2_sitelib}/flask_fas_openid.py*
  
  %changelog
- * Fri Mar 14 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.33-1.1
++* Fri Mar 14 2014 Toshio Kuratomi <toshio at 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 at ausil.us> - 0.3.33-2
+ - clean up some rhel logic in the spec
  
  * Thu Dec 19 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.33-1
  - Update for final release with numerous flask_fas_openid fixes