From cba875decbf5eb0d678c0e58e7616cac5f938ddf Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Feb 19 2018 22:11:45 +0000 Subject: Update Python 2 dependency declarations to new packaging standards --- diff --git a/atomic-reactor.spec b/atomic-reactor.spec index 8cb3e0d..4282a12 100644 --- a/atomic-reactor.spec +++ b/atomic-reactor.spec @@ -32,7 +32,7 @@ Name: %{project} Version: 1.6.29 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Improved builder for Docker images Group: Development/Tools @@ -60,20 +60,20 @@ BuildRequires: git %endif # with_check BuildRequires: python2-devel -BuildRequires: python-setuptools +BuildRequires: python2-setuptools %if 0%{?with_check} -BuildRequires: pytest -BuildRequires: python-pytest-capturelog -BuildRequires: python-dockerfile-parse >= 0.0.5 +BuildRequires: python2-pytest +BuildRequires: python2-pytest-capturelog +BuildRequires: python2-dockerfile-parse >= 0.0.5 BuildRequires: python2-docker -BuildRequires: python-flexmock >= 0.10.2 -BuildRequires: python-six +BuildRequires: python2-flexmock >= 0.10.2 +BuildRequires: python2-six BuildRequires: python2-osbs-client >= 0.45 -BuildRequires: python-backports-lzma +BuildRequires: python2-backports-lzma BuildRequires: python2-responses -BuildRequires: python-jsonschema -BuildRequires: PyYAML -BuildRequires: python-mock +BuildRequires: python2-jsonschema +BuildRequires: python2-pyyaml +BuildRequires: python2-mock BuildRequires: python2-docker-squash >= 1.0.0-0.3 %endif # with_check @@ -120,13 +120,13 @@ Summary: Python 2 Atomic Reactor library Group: Development/Tools License: BSD Requires: python2-docker -Requires: python-requests -Requires: python-setuptools -Requires: python-dockerfile-parse >= 0.0.5 +Requires: python2-requests +Requires: python2-setuptools +Requires: python2-dockerfile-parse >= 0.0.5 Requires: python2-docker-squash >= 1.0.0-0.3 -Requires: python-backports-lzma -Requires: python-jsonschema -Requires: PyYAML +Requires: python2-backports-lzma +Requires: python2-jsonschema +Requires: python2-pyyaml Provides: python-dock = %{version}-%{release} Obsoletes: python-dock < %{dock_obsolete_vr} @@ -428,6 +428,10 @@ LANG=en_US.utf8 py.test-%{python2_version} -vv tests %changelog +* Mon Feb 19 2018 Iryna Shcherbina - 1.6.29-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Thu Feb 01 2018 Clement Verna - 1.6.29-2 - Added patch to fix unit test on multi arch - Build Requires osbs-client version 0.45 for unit test