diff --git a/python-fedora.spec b/python-fedora.spec index fc46e3c..9c43a3f 100644 --- a/python-fedora.spec +++ b/python-fedora.spec @@ -16,23 +16,38 @@ and FAS2.\ Name: python-fedora Version: 0.9.0 -Release: 4%{?dist} -Summary: Python modules for talking to Fedora Infrastructure Services +Release: 5%{?dist} +BuildArch: noarch -Group: Development/Languages License: LGPLv2+ +Summary: Python modules for talking to Fedora Infrastructure Services +Group: Development/Languages URL: https://fedorahosted.org/python-fedora/ Source0: https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}%{?prerel}.tar.gz -BuildArch: noarch +BuildRequires: TurboGears2 +BuildRequires: python-lockfile +BuildRequires: python-munch +BuildRequires: python-openid +BuildRequires: python-openid-cla +BuildRequires: python-openid-teams BuildRequires: python2-devel -BuildRequires: python-setuptools -%if 0%{?rhel} && 0%{?rhel} <= 6 + +%if 0%{?rhel} == 6 +BuildRequires: Django BuildRequires: python-sphinx10 %else +BuildRequires: python-repoze-who-friendlyform +%if 0%{?fedora} >= 25 +BuildRequires: python2-django +BuildRequires: python2-sphinx +%else +BuildRequires: python-django BuildRequires: python-sphinx %endif +%endif + %if 0%{?fedora} || (0%{?rhel} <= 7) BuildRequires: python-cherrypy2 %else @@ -41,28 +56,47 @@ BuildRequires: python-cherrypy2 BuildRequires: python-cherrypy %endif %endif -BuildRequires: python-babel -BuildRequires: TurboGears2 -BuildRequires: python-nose -BuildRequires: python-kitchen -BuildRequires: python-munch + # Needed for tests and for the way we build docs %if 0%{?rhel} < 7 # Phasing this out. First from epel7 and later for everything BuildRequires: TurboGears %endif -BuildRequires: python-repoze-who-friendlyform -%if 0%{?rhel} == 6 -BuildRequires: Django + +%if 0%{?fedora} >= 25 +BuildRequires: python2-babel +BuildRequires: python2-nose +BuildRequires: python2-requests >= 2.6.0 +BuildRequires: python2-setuptools +%if 0%{?fedora} >= 26 +BuildRequires: python2-kitchen +BuildRequires: python2-six %else -BuildRequires: python-django +BuildRequires: python-kitchen +BuildRequires: python-six +%endif +%else +BuildRequires: python-babel +BuildRequires: python-kitchen +BuildRequires: python-nose +BuildRequires: python-requests >= 2.6.0 +BuildRequires: python-setuptools +BuildRequires: python-six +%endif + +%if 0%{?with_python3} +BuildRequires: python3-babel +BuildRequires: python3-devel +BuildRequires: python3-kitchen +BuildRequires: python3-lockfile +BuildRequires: python3-munch +BuildRequires: python3-nose +BuildRequires: python3-openid +BuildRequires: python3-requests >= 2.6.0 +BuildRequires: python3-setuptools +BuildRequires: python3-six +BuildRequires: python3-sphinx %endif -BuildRequires: python-requests >= 2.6.0 -BuildRequires: python-openid -BuildRequires: python-openid-teams -BuildRequires: python-openid-cla -BuildRequires: python-six -BuildRequires: python-lockfile %description @@ -74,17 +108,31 @@ Summary: %{summary} Group: Development/Languages Requires: python-beautifulsoup4 -Requires: python-kitchen Requires: python-lockfile Requires: python-munch -Requires: python-openidc-client -Requires: python-requests >= 2.6.0 -Requires: python-six # These are now optional dependencies. Some bodhi methods will not work if # they aren't installed but they aren't needed for most functionality of the # module. #Requires: koji python-iniparse yum +%if 0%{?fedora} >= 25 +Requires: python2-openidc-client +Requires: python2-requests >= 2.6.0 +%if 0%{?fedora} >= 26 +Requires: python2-kitchen +Requires: python2-six +%else +Requires: python-kitchen +Requires: python-six +%endif +%else +Requires: python-kitchen +Requires: python-openidc-client +Requires: python-requests >= 2.6.0 +Requires: python-six +%endif + + %{?python_provide:%python_provide python2-fedora} @@ -97,26 +145,13 @@ Requires: python-six Summary: %{summary} Group: Development/Languages -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-sphinx -BuildRequires: python3-babel -BuildRequires: python3-nose -BuildRequires: python3-kitchen -BuildRequires: python3-munch - -BuildRequires: python3-requests >= 2.6.0 -BuildRequires: python3-openid -BuildRequires: python3-six -BuildRequires: python3-lockfile - -Requires: python3-munch -Requires: python3-kitchen -Requires: python3-requests >= 2.6.0 Requires: python3-beautifulsoup4 -Requires: python3-six +Requires: python3-kitchen Requires: python3-lockfile +Requires: python3-munch Requires: python3-openidc-client +Requires: python3-requests >= 2.6.0 +Requires: python3-six %{?python_provide:%python_provide python3-fedora} @@ -128,12 +163,13 @@ Requires: python3-openidc-client %package -n python3-fedora-flask Summary: Python modules for flask applications authing to Fedora Account System License: LGPLv2+ + Requires: python3-fedora = %{version}-%{release} Requires: python3-flask Requires: python3-flask-wtf Requires: python3-openid -Requires: python3-openid-teams Requires: python3-openid-cla +Requires: python3-openid-teams %{?python_provide:%python_provide python3-fedora-flask} @@ -149,12 +185,23 @@ Account System. Summary: Python modules for TurboGears applications in Fedora Infrastructure Group: Development/Languages License: LGPLv2+ -Requires: python2-fedora = %{version}-%{release} + Requires: TurboGears -Requires: python-sqlalchemy -Requires: python-decorator Requires: python-bugzilla Requires: python-feedparser +Requires: python2-fedora = %{version}-%{release} + +%if 0%{?fedora} >= 25 +Requires: python2-decorator +%if 0%{?fedora} >= 26 +Requires: python2-sqlalchemy +%else +Requires: python-sqlalchemy +%endif +%else +Requires: python-decorator +Requires: python-sqlalchemy +%endif %{?python_provide:%python_provide python2-fedora-turbogears} @@ -171,15 +218,23 @@ other helper functions for TurboGears applications. Summary: Python modules for TurboGears applications in Fedora Infrastructure Group: Development/Languages License: LGPLv2+ -Requires: python2-fedora = %{version}-%{release} + Requires: TurboGears2 +Requires: python-repoze-who-friendlyform Requires: python-sqlalchemy +Requires: python2-fedora = %{version}-%{release} + %if 0%{?fedora} || 0%{?rhel} >= 7 Requires: python-mako >= 0.3.6 %else Requires: python-mako0.4 >= 0.3.6 %endif -Requires: python-repoze-who-friendlyform + +%if 0%{?fedora} >= 26 +Requires: python2-sqlalchemy +%else +Requires: python-sqlalchemy +%endif %{?python_provide:%python_provide python2-fedora-turbogears2} @@ -195,13 +250,21 @@ TurboGears2 applications. Summary: Python modules for django applications authing to Fedora Account System Group: Development/Languages License: LGPLv2+ + Requires: python2-fedora = %{version}-%{release} + %if 0%{?rhel} == 6 Requires: Django %else + +%if 0%{?fedora} >= 25 +Requires: python2-django +%else Requires: python-django %endif +%endif + %{?python_provide:%python_provide python2-fedora-django} @@ -214,12 +277,18 @@ Account System. Summary: Python modules for flask applications authing to Fedora Account System Group: Development/Languages License: LGPLv2+ -Requires: python2-fedora = %{version}-%{release} -Requires: python-flask + Requires: python-flask-wtf Requires: python-openid -Requires: python-openid-teams Requires: python-openid-cla +Requires: python-openid-teams +Requires: python2-fedora = %{version}-%{release} + +%if 0%{?fedora} >= 25 +Requires: python2-flask +%else +Requires: python-flask +%endif %{?python_provide:%python_provide python2-fedora-flask} @@ -346,6 +415,9 @@ rm -rf %{buildroot}%{python2_sitelib}/tests/ %{python2_sitelib}/flask_fas_openid.py* %changelog +* Fri Jul 07 2017 Randy Barlow - 0.9.0-5 +- Use python2- dependencies where available. + * Thu Jul 06 2017 Randy Barlow - 0.9.0-4 - Provide python2- subpackages. - Use the license macro.