From 38fd4fce0a93683510e27ed67e34dc4fecbd0f67 Mon Sep 17 00:00:00 2001 From: mprahl Date: Jan 14 2019 14:01:34 +0000 Subject: [PATCH 1/4] Add python-pungi as a dependency --- diff --git a/module-build-service.spec b/module-build-service.spec index 39e01b0..f37641e 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -5,7 +5,7 @@ Name: module-build-service Version: 2.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Module Build Service for Modularity Group: Development/Tools @@ -47,6 +47,7 @@ BuildRequires: python3-moksha-hub BuildRequires: python3-kobo BuildRequires: python3-kobo-rpmlib BuildRequires: python3-fedmsg +BuildRequires: python3-pungi %else @@ -66,6 +67,7 @@ BuildRequires: python-ldap3 BuildRequires: python-enum34 BuildRequires: python2-koji BuildRequires: python2-fedmsg +BuildRequires: python2-pungi %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: python-setuptools @@ -122,7 +124,7 @@ Requires: python3-flask-sqlalchemy Requires: python3-flask-migrate Requires: python3-mock Requires: python3-six - +Requires: python3-pungi Requires: python3-sqlalchemy Requires: python3-moksha-hub Requires: python3-m2crypto @@ -145,6 +147,7 @@ Requires: python-gobject-base Requires: python2-solv Requires: python2-koji Requires: python2-fedmsg +Requires: python2-pungi %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-flask-sqlalchemy @@ -287,6 +290,9 @@ done %changelog +* Wed Jan 09 2019 mprahl - 2.11.1-2 +- Add python-pungi as a dependency for Fedora builds + * Wed Dec 19 2018 mprahl - 2.11.1-1 - new version From 522bcf59e379a550cb10f48604b96daed96991fe Mon Sep 17 00:00:00 2001 From: mprahl Date: Jan 14 2019 14:01:34 +0000 Subject: [PATCH 2/4] Remove pdc-client as a dependency --- diff --git a/module-build-service.spec b/module-build-service.spec index f37641e..3d8b78a 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -25,7 +25,6 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-m2crypto BuildRequires: python3-mock -BuildRequires: python3-pdc-client BuildRequires: python3-flask-script BuildRequires: python3-munch BuildRequires: python3-funcsigs @@ -55,7 +54,6 @@ BuildRequires: python2-devel BuildRequires: python2-mock BuildRequires: m2crypto -BuildRequires: python2-pdc-client BuildRequires: python-flask-script BuildRequires: python-m2ext BuildRequires: python-munch @@ -111,7 +109,6 @@ BuildRequires: gobject-introspection BuildRequires: rpm-build %if 0%{?with_python3} -Requires: python3-pdc-client Requires: python3-flask-script Requires: python3-munch Requires: python3-funcsigs @@ -136,7 +133,6 @@ Requires: python3-requests Requires: python3-pyOpenSSL Requires: python3-fedmsg %else -Requires: python2-pdc-client Requires: python-flask-script Requires: python-munch Requires: python2-funcsigs @@ -292,6 +288,7 @@ done %changelog * Wed Jan 09 2019 mprahl - 2.11.1-2 - Add python-pungi as a dependency for Fedora builds +- Remove pdc-client as a dependency * Wed Dec 19 2018 mprahl - 2.11.1-1 - new version From f2caa048373b2615e985201e885d85e9c225a7d0 Mon Sep 17 00:00:00 2001 From: mprahl Date: Jan 14 2019 14:01:34 +0000 Subject: [PATCH 3/4] Remove some leftover with_epel macros --- diff --git a/module-build-service.spec b/module-build-service.spec index 3d8b78a..3d7bd2a 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -227,13 +227,14 @@ sed -i '/enum34/d' requirements.txt %py2_install %endif -%if 0%{?with_epel} - %if 0%{?with_python3} export PYTHONPATH=%{buildroot}%{python3_sitelib} %else export PYTHONPATH=%{buildroot}%{python2_sitelib} %endif + +# The version of kobo required is not in RHEL/EPEL, so these commands will fail +%if 0%{?fedora} mkdir -p %{buildroot}/%{_mandir}/man1 for command in mbs-manager mbs-frontend mbs-upgradedb ; do MBS_CONFIG_FILE=conf/config.py %{buildroot}/%{_bindir}/$command --help || true @@ -243,7 +244,6 @@ MBS_CONFIG_FILE=conf/config.py help2man -N --version-string=%{version} \ done %endif - %check # https://pagure.io/fm-orchestrator/issue/664 #nosetests-%{python2_version} -v @@ -280,11 +280,10 @@ done %exclude %{python2_sitelib}/tests/ %endif -%if 0%{?with_epel} +%if 0%{?fedora} %{_mandir}/man1/mbs-*.1* %endif - %changelog * Wed Jan 09 2019 mprahl - 2.11.1-2 - Add python-pungi as a dependency for Fedora builds From 801a8024fd25131cd7244fffe320d63b4273da18 Mon Sep 17 00:00:00 2001 From: mprahl Date: Jan 14 2019 14:01:34 +0000 Subject: [PATCH 4/4] Remove the commented out check section since it's not functional --- diff --git a/module-build-service.spec b/module-build-service.spec index 3d7bd2a..3d67a71 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -24,7 +24,6 @@ ExclusiveArch: %{ix86} x86_64 noarch BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-m2crypto -BuildRequires: python3-mock BuildRequires: python3-flask-script BuildRequires: python3-munch BuildRequires: python3-funcsigs @@ -52,7 +51,6 @@ BuildRequires: python3-pungi BuildRequires: python2-devel -BuildRequires: python2-mock BuildRequires: m2crypto BuildRequires: python-flask-script BuildRequires: python-m2ext @@ -71,7 +69,6 @@ BuildRequires: python2-pungi BuildRequires: python-setuptools BuildRequires: python-flask-sqlalchemy BuildRequires: python-flask-migrate -BuildRequires: python-mock BuildRequires: python-six BuildRequires: pyOpenSSL BuildRequires: python-sqlalchemy @@ -85,7 +82,6 @@ BuildRequires: python-requests BuildRequires: python2-setuptools BuildRequires: python2-flask-sqlalchemy BuildRequires: python2-flask-migrate -BuildRequires: python2-mock BuildRequires: python2-six BuildRequires: python2-futures BuildRequires: python2-flask @@ -119,7 +115,6 @@ Requires: python3-solv Requires: python3-koji Requires: python3-flask-sqlalchemy Requires: python3-flask-migrate -Requires: python3-mock Requires: python3-six Requires: python3-pungi Requires: python3-sqlalchemy @@ -148,7 +143,6 @@ Requires: python2-pungi %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-flask-sqlalchemy Requires: python-flask-migrate -Requires: python-mock Requires: python-six Requires: python-sqlalchemy Requires: python-moksha-hub @@ -160,7 +154,6 @@ Requires: python-requests %else Requires: python2-flask-sqlalchemy Requires: python2-flask-migrate -Requires: python2-mock Requires: python2-six Requires: python2-futures Requires: python2-flask @@ -244,11 +237,6 @@ MBS_CONFIG_FILE=conf/config.py help2man -N --version-string=%{version} \ done %endif -%check -# https://pagure.io/fm-orchestrator/issue/664 -#nosetests-%{python2_version} -v - - %files %doc README.rst %license LICENSE