From 6a3026a8d783d8e9f6182602e4a10cd1e31920b2 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 8 May 2018 11:14:49 -0400 Subject: [PATCH] Try to fix 'm2ext' and moksha.hub dep issues. --- module-build-service.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/module-build-service.spec b/module-build-service.spec index 0526fa8..993933c 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -5,7 +5,7 @@ Name: module-build-service Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Module Build Service for Modularity Group: Development/Tools @@ -43,6 +43,7 @@ BuildRequires: python3-dogpile-cache BuildRequires: python3-requests BuildRequires: python3-pyOpenSSL BuildRequires: python3-sqlalchemy +BuildRequires: python3-moksha-hub %else @@ -70,6 +71,7 @@ BuildRequires: python-mock BuildRequires: python-six BuildRequires: pyOpenSSL BuildRequires: python-sqlalchemy +BuildRequires: python-moksha-hub BuildRequires: python-futures BuildRequires: python-flask BuildRequires: python-dogpile-cache @@ -87,6 +89,7 @@ BuildRequires: python2-dogpile-cache BuildRequires: python2-requests BuildRequires: python2-pyOpenSSL BuildRequires: python2-sqlalchemy +BuildRequires: python2-moksha-hub %endif %endif @@ -117,6 +120,7 @@ Requires: python3-mock Requires: python3-six Requires: python3-sqlalchemy +Requires: python3-moksha-hub Requires: python3-flask Requires: python3-dogpile-cache Requires: python3-requests @@ -138,6 +142,7 @@ Requires: python-flask-migrate Requires: python-mock Requires: python-six Requires: python-sqlalchemy +Requires: python-moksha-hub Requires: python-futures Requires: python-flask Requires: python-dogpile-cache @@ -154,6 +159,7 @@ Requires: python2-dogpile-cache Requires: python2-requests Requires: python2-pyOpenSSL Requires: python2-sqlalchemy +Requires: python2-moksha-hub %endif %endif @@ -193,6 +199,9 @@ for a number of tasks: # Workaround because python2-koji has no egg-info file at the momement sed -i '/koji/d' requirements.txt +# Also, m2ext. https://pagure.io/fm-orchestrator/issue/931 +sed -i '/m2ext/d' requirements.txt + %build %if 0%{?with_python3} %py3_build @@ -268,6 +277,10 @@ done %changelog +* Tue May 08 2018 Ralph Bean - 2.1.0-2 +- Try to fix 'm2ext' and moksha.hub dep issues. + https://pagure.io/fm-orchestrator/issue/931 + * Fri May 04 2018 mprahl - 2.1.0-1 - new version