From 128b8ec977bca0385dfc062ba8f0630effc14eb8 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Sep 22 2016 17:43:01 +0000 Subject: Handle new Requires/BuildRequires for epel/f23 and older as well as f24+ --- diff --git a/osbs-client.spec b/osbs-client.spec index f672d06..9eb67a4 100644 --- a/osbs-client.spec +++ b/osbs-client.spec @@ -26,7 +26,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) # set to 0 to create a normal release %global postrelease 0 -%global release 2 +%global release 3 %global osbs_obsolete_vr 0.14-2 @@ -59,14 +59,24 @@ Requires: python3-requests Requires: python3-requests-kerberos %else Requires: python-osbs-client = %{version}-%{release} -Requires: python2-requests -Requires: python2-requests-kerberos %endif +%if (0%{?fedora} <= 23 || 0%{?rhel} <= 7) +BuildRequires: python2-devel +BuildRequires: python-requests +BuildRequires: python-requests-kerberos +BuildRequires: python-setuptools +Requires: python-requests +Requires: python-requests-kerberos +%else BuildRequires: python2-devel -BuildRequires: python2-requests -BuildRequires: python2-requests-kerberos +BuildRequires: python-requests +BuildRequires: python-requests-kerberos BuildRequires: python-setuptools +Requires: python2-requests +Requires: python2-requests-kerberos +%endif + %if 0%{?with_check} BuildRequires: pytest BuildRequires: python-pytest-capturelog @@ -211,6 +221,9 @@ LANG=en_US.utf8 py.test-%{python2_version} -vv tests %endif # with_python3 %changelog +* Thu Sep 22 2016 Adam Miller - 0.30-3 +- Handle new Requires/BuildRequires for epel/f23 and older as well as f24+ + * Wed Sep 21 2016 Adam Miller - 0.30-2 - Apply patch from puiterwijk to switch to python-requests from pycurl