diff --git a/module-build-service.spec b/module-build-service.spec index d52b09b..02014bf 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Module Build Service for Modularity Group: Development/Tools @@ -10,7 +10,6 @@ Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{vers BuildArch: noarch -BuildRequires: python-setuptools BuildRequires: python2-devel BuildRequires: python2-nose @@ -35,7 +34,6 @@ BuildRequires: python-six BuildRequires: python-sqlalchemy BuildRequires: python-systemd BuildRequires: python2-flask-migrate -BuildRequires: python2-flask-sqlalchemy BuildRequires: python2-funcsigs BuildRequires: python2-mock BuildRequires: python2-modulemd @@ -43,6 +41,14 @@ BuildRequires: python3-mock BuildRequires: python3-modulemd BuildRequires: rpm-build +%if 0%{?rhel} && 0%{?rhel} <= 7 +BuildRequires: python-setuptools +BuildRequires: python-flask-sqlalchemy +%else +BuildRequires: python2-setuptools +BuildRequires: python2-flask-sqlalchemy +%endif + BuildRequires: systemd %{?systemd_requires} @@ -67,7 +73,6 @@ Requires: python-six Requires: python-sqlalchemy Requires: python-systemd Requires: python2-flask-migrate -Requires: python2-flask-sqlalchemy Requires: python2-funcsigs Requires: python2-mock Requires: python2-modulemd @@ -75,6 +80,12 @@ Requires: python3-mock Requires: python3-modulemd Requires: rpm-build +%if 0%{?rhel} && 0%{?rhel} <= 7 +Requires: python-flask-sqlalchemy +%else +Requires: python2-flask-sqlalchemy +%endif + %description The orchestrator coordinates module builds and is responsible for a number of @@ -134,6 +145,9 @@ nosetests-2 %changelog +* Wed Jan 11 2017 Ralph Bean - 1.0.2-4 +- Conditionalize some deps for EPEL7. + * Wed Jan 11 2017 Ralph Bean - 1.0.2-3 - Sync spec file from upstream git.