From ef8395cff11fe7c7e036e1622802e2a7ce595509 Mon Sep 17 00:00:00 2001 From: John Dennis Date: Tue, 10 Jul 2018 08:15:14 -0400 Subject: [PATCH] Unify spec file between Fedora and RHEL --- python-oauthlib.spec | 55 +++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/python-oauthlib.spec b/python-oauthlib.spec index 5f8ad34..4abbd10 100644 --- a/python-oauthlib.spec +++ b/python-oauthlib.spec @@ -1,8 +1,14 @@ -%if 0%{?fedora} || 0%{?rhel} > 7 -%global with_python3 1 +%bcond_with jwcrypto +%global with_python2 0 +%global with_python3 0 + +%if (0%{?fedora} > 0 && 0%{?fedora} < 32) || (0%{?rhel} > 0 && 0%{?rhel} <= 7) + %global with_python2 1 %endif -%bcond_with jwcrypto +%if 0%{?fedora} || 0%{?rhel} >= 8 + %global with_python3 1 +%endif %if 0%{?rhel} && 0%{?rhel} <= 7 %{!?__python2: %global __python2 /usr/bin/python2} @@ -24,14 +30,14 @@ Name: python-oauthlib Version: 2.0.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An implementation of the OAuth request-signing logic Group: Development/Libraries License: BSD -URL: http://pypi.python.org/pypi/oauthlib -Source0: http://pypi.python.org/packages/source/o/%{modname}/%{modname}-%{version}.tar.gz -#Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{commit}/%{gh_project}-%{commit}.tar.gz +URL: https://pypi.python.org/pypi/oauthlib +Source0: https://files.pythonhosted.org/packages/source/o/%{modname}/%{modname}-%{version}.tar.gz +#Source0: https://github.com/%%{gh_owner}/%%{gh_project}/archive/%%{commit}/%%{gh_project}-%%{commit}.tar.gz BuildArch: noarch @@ -46,6 +52,7 @@ onto your favourite web framework. If you're a maintainer of such a library, write a thin veneer on top of OAuthLib and get OAuth support for very little effort. +%if 0%{with_python2} %package -n python2-oauthlib Summary: An implementation of the OAuth request-signing logic Group: Development/Libraries @@ -79,8 +86,9 @@ OAuth client support onto your favorite HTTP library, or provider support onto your favourite web framework. If you're a maintainer of such a library, write a thin veneer on top of OAuthLib and get OAuth support for very little effort. +%endif # with python2 -%if 0%{?with_python3} +%if 0%{with_python3} %package -n python3-oauthlib Summary: An implementation of the OAuth request-signing logic Group: Development/Libraries @@ -114,11 +122,11 @@ OAuth client support onto your favorite HTTP library, or provider support onto your favourite web framework. If you're a maintainer of such a library, write a thin veneer on top of OAuthLib and get OAuth support for very little effort. -%endif +%endif # with python3 %prep %setup -q -n %{modname}-%{version} -#%%setup -q -n %{gh_project}-%{commit} +#%%setup -q -n %%{gh_project}-%%{commit} %if %{with jwcrypto} %patch0 -p1 @@ -132,38 +140,49 @@ sed -i "s/'unittest2', //" setup.py rm -rf %{modname}.egg-info %build +%if 0%{with_python2} %py2_build -%if 0%{?with_python3} +%endif # with python2 +%if 0%{with_python3} %py3_build -%endif +%endif # with python3 %install +%if 0%{with_python2} %py2_install -%if 0%{?with_python3} +%endif # with python2 +%if 0%{with_python3} %py3_install -%endif +%endif # with python3 %check +%if 0%{with_python2} %{__python2} setup.py test -%if 0%{?with_python3} +%endif # with python2 +%if 0%{with_python3} %{__python3} setup.py test -%endif +%endif # with python3 +%if 0%{with_python2} %files -n python2-oauthlib %doc README.rst %license LICENSE %{python2_sitelib}/%{modname}/ %{python2_sitelib}/%{modname}-%{version}* +%endif # with python2 -%if 0%{?with_python3} +%if 0%{with_python3} %files -n python3-oauthlib %doc README.rst %license LICENSE %{python3_sitelib}/%{modname}/ %{python3_sitelib}/%{modname}-%{version}-* -%endif +%endif # with python3 %changelog +* Tue Jul 10 2018 - 2.0.1-9 +- Unify spec file between Fedora and RHEL + * Fri Jun 15 2018 Miro Hrončok - 2.0.1-8 - Rebuilt for Python 3.7