diff --git a/osbs-client.spec b/osbs-client.spec index b2751db..40c5eb3 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 @@ -51,10 +51,10 @@ Requires: python3-osbs-client = %{version}-%{release} Requires: python3-requests Requires: python3-requests-kerberos %else -Requires: python-osbs-client = %{version}-%{release} +Requires: python2-osbs-client = %{version}-%{release} %endif -%if (0%{?fedora} <= 23 || 0%{?rhel} <= 7) +%if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7) BuildRequires: python2-devel BuildRequires: python-requests BuildRequires: python-requests-kerberos @@ -63,17 +63,17 @@ BuildRequires: python-setuptools BuildRequires: python2-devel BuildRequires: python2-requests BuildRequires: python2-requests-kerberos -BuildRequires: python-setuptools +BuildRequires: python2-setuptools %endif %if 0%{?with_check} -BuildRequires: pytest -BuildRequires: python-pytest-capturelog -BuildRequires: python-flexmock -BuildRequires: python-six -BuildRequires: python-dockerfile-parse -BuildRequires: python-requests -BuildRequires: python-requests-kerberos +BuildRequires: python2-pytest +BuildRequires: python2-pytest-capturelog +BuildRequires: python2-flexmock +BuildRequires: python2-six +BuildRequires: python2-dockerfile-parse +BuildRequires: python2-requests +BuildRequires: python2-requests-kerberos %endif # with_check %if 0%{?with_python3} @@ -106,14 +106,14 @@ This package contains osbs command line client. Summary: Python 2 module for OpenShift Build Service Group: Development/Tools License: BSD -Requires: python-dockerfile-parse -Requires: python-setuptools -Requires: python-six +Requires: python2-dockerfile-parse +Requires: python2-setuptools +Requires: python2-six Requires: krb5-workstation %if 0%{?rhel} && 0%{?rhel} <= 6 Requires: python-argparse %endif -%if (0%{?fedora} <= 23 || 0%{?rhel} <= 7) +%if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7) Requires: python-requests Requires: python-requests-kerberos Requires: python-six @@ -221,6 +221,10 @@ LANG=en_US.utf8 py.test-%{python2_version} -vv tests %endif # with_python3 %changelog +* Thu Mar 01 2018 Iryna Shcherbina - 0.45-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Thu Feb 08 2018 Fedora Release Engineering - 0.45-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild