diff --git a/.gitignore b/.gitignore index 2f609d0..068f18f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ /module-build-service-1.3.18.tar.gz /module-build-service.spec /module-build-service-1.3.20.tar.gz -/module-build-service-1.3.21.tar.gz +/module-build-service-1.3.22.tar.gz diff --git a/mbs-fix-reuse-all.patch b/mbs-fix-reuse-all.patch new file mode 100644 index 0000000..5e3f6d5 --- /dev/null +++ b/mbs-fix-reuse-all.patch @@ -0,0 +1,16 @@ +diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py +index 04aeaf9..3d13e30 100644 +--- a/module_build_service/scheduler/handlers/modules.py ++++ b/module_build_service/scheduler/handlers/modules.py +@@ -239,8 +239,10 @@ def wait(config, session, msg): + # If all components in module build will be reused, we don't have to build + # module-build-macros, because there won't be any build done. + if attempt_to_reuse_all_components(builder, session, build): +- log.info("All components have ben reused for module %r, " ++ log.info("All components have been reused for module %r, " + "skipping build" % build) ++ build.transition(config, state="build") ++ session.add(build) + session.commit() + return [] + else: diff --git a/mbs-no-mbsbuild.patch b/mbs-no-mbsbuild.patch new file mode 100644 index 0000000..b5a0f05 --- /dev/null +++ b/mbs-no-mbsbuild.patch @@ -0,0 +1,21 @@ +diff --git a/requirements.txt b/requirements.txt +index 81b8fa1..5281b57 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -20,4 +20,3 @@ qpid-python + six + sqlalchemy + futures # Python 2 only +-tabulate +diff --git a/setup.py b/setup.py +index 3d011e3..45bc6f0 100644 +--- a/setup.py ++++ b/setup.py +@@ -31,7 +31,6 @@ setup(name='module-build-service', + 'moksha.consumer': 'mbsconsumer = module_build_service.scheduler.consumer:MBSConsumer', + 'moksha.producer': 'mbspoller = module_build_service.scheduler.producer:MBSProducer', + }, +- scripts=["contrib/mbs-build"], + data_files=[('/etc/module-build-service/', ['conf/cacert.pem', + 'conf/config.py', + 'conf/copr.conf', diff --git a/module-build-service.spec b/module-build-service.spec index d1ad7b1..29819de 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,14 +1,17 @@ Name: module-build-service -Version: 1.3.21 +Version: 1.3.22 Release: 3%{?dist} Summary: The Module Build Service for Modularity + Group: Development/Tools License: MIT URL: https://pagure.io/fm-orchestrator Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz -Patch0: mock-no-bootstrap-container.patch -Patch1: mbs-expand-home-dir.patch +%if 0%{?rhel} && 0%{?rhel} <= 7 +Patch0: mbs-no-mbsbuild.patch +%endif +Patch1: mbs-fix-reuse-all.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -45,6 +48,7 @@ BuildRequires: python2-modulemd >= 1.1.0 BuildRequires: rpm-build BuildRequires: python-qpid BuildRequires: python-futures +BuildRequires: python-openidc-client %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: python-setuptools @@ -58,7 +62,7 @@ BuildRequires: python2-flask-sqlalchemy BuildRequires: python2-flask-migrate BuildRequires: python2-nose BuildRequires: python2-mock -Buildrequires: python2-tabulate +BuildRequires: python2-tabulate %endif BuildRequires: systemd @@ -89,6 +93,7 @@ Requires: python2-modulemd >= 1.1.0 Requires: rpm-build Requires: python-qpid Requires: python-futures +Requires: python-openidc-client %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-flask-sqlalchemy @@ -98,7 +103,6 @@ Requires: python-mock Requires: python2-flask-sqlalchemy Requires: python2-flask-migrate Requires: python2-mock -Requires: python2-openidc-client Requires: python2-tabulate Requires: python2-systemd %endif @@ -121,6 +125,10 @@ for a number of tasks: %prep %setup -q +%if 0%{?rhel} && 0%{?rhel} <= 7 +%patch0 -p1 +%endif +%patch1 -p1 %patch0 -p1 %patch1 -p1 @@ -173,27 +181,15 @@ done %changelog -* Tue May 09 2017 Jan Kaluza - 1.3.21-3 -- fix homedir expansion in configuration variables +* Thu May 25 2017 Jan Kaluza - 1.3.22-3 +- Use the same spec file for both epel7 and fedora -* Tue May 09 2017 Jan Kaluza - 1.3.21-2 -- fix the compatibility with new Mock +* Tue May 16 2017 Jan Kaluza - 1.3.22-2 +- fix reusing all components -* Tue May 02 2017 Jan Kaluza - 1.3.21-1 +* Fri May 12 2017 Jan Kaluza - 1.3.22-1 - new version -* Thu Apr 20 2017 Jan Kaluza - 1.3.20-5 -- add python2-system dependency - -* Thu Apr 20 2017 Jan Kaluza - 1.3.20-4 -- fix mock backend issues - -* Wed Apr 12 2017 Jan Kaluza - 1.3.20-3 -- fix mock backend issues - -* Mon Apr 10 2017 Jan Kaluza - 1.3.20-2 -- add missing dependencies for mbs-build - * Fri Apr 07 2017 Jan Kaluza - 1.3.20-1 - new version diff --git a/sources b/sources index c12a3dd..b9ce51a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-1.3.21.tar.gz) = 37cb161a64929597e79511fb4a647ad4d29f84a4335bfb4039b388a14e1a1ba55fbc1593201e2bb5bba4d3ec597a42f5dd8b1f701d7072f5540b8b59617ea958 +SHA512 (module-build-service-1.3.22.tar.gz) = 3eb4a24d8d1acec1bce5b8b704ecb1663792502c7437ae54ad4ab8b5e49eacc502d580391ec1c8bfe5b657bf78faa903196b29dc6914b0a9fd6536243c6fd91d