diff --git a/osbs-client.spec b/osbs-client.spec index 40c5eb3..cda8ee0 100644 --- a/osbs-client.spec +++ b/osbs-client.spec @@ -17,21 +17,30 @@ %global binaries_py_version %{python2_version} %endif -%if 0%{?fedora} +%if (0%{?fedora} < 28) +# tests are failling in f28 with new version of pytest # rhel/epel has no flexmock, pytest-capturelog %global with_check 1 %endif -%global commit 7632fdf836db9c73249cbca123e6b94be6d37cd4 +%global commit 0599f591ba6330fd2097e9b455676f75800ce0c9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) + # set to 0 to create a normal release +%global dev_release 0 + +%if 0%{?dev_release} +%global postrelease dev +%global release 0 +%else %global postrelease 0 -%global release 3 +%global release 1 +%endif %global osbs_obsolete_vr 0.14-2 Name: osbs-client -Version: 0.45 +Version: 0.47 %if "x%{postrelease}" != "x0" Release: %{release}.%{postrelease}.git.%{shortcommit}%{?dist} %else @@ -74,6 +83,7 @@ BuildRequires: python2-six BuildRequires: python2-dockerfile-parse BuildRequires: python2-requests BuildRequires: python2-requests-kerberos +BuildRequires: python2-pyyaml %endif # with_check %if 0%{?with_python3} @@ -89,6 +99,7 @@ BuildRequires: python3-dockerfile-parse BuildRequires: python3-pytest-runner BuildRequires: python3-requests BuildRequires: python3-requests-kerberos +BuildRequires: python3-PyYAML %endif # with_check %endif # with_python3 @@ -221,6 +232,9 @@ LANG=en_US.utf8 py.test-%{python2_version} -vv tests %endif # with_python3 %changelog +* Tue May 15 2018 Clement Verna - 0.47-1 +- new upstream release: 0.47 + * Thu Mar 01 2018 Iryna Shcherbina - 0.45-3 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)