diff --git a/mock-no-bootstrap-container.patch b/mock-no-bootstrap-container.patch new file mode 100644 index 0000000..2785426 --- /dev/null +++ b/mock-no-bootstrap-container.patch @@ -0,0 +1,12 @@ +diff --git a/module_build_service/builder/MockModuleBuilder.py b/module_build_service/builder/MockModuleBuilder.py +index 763f779..5a4978d 100644 +--- a/module_build_service/builder/MockModuleBuilder.py ++++ b/module_build_service/builder/MockModuleBuilder.py +@@ -67,6 +67,7 @@ config_opts['extra_chroot_dirs'] = [ '/run/lock', ] + config_opts['releasever'] = '' + config_opts['package_manager'] = 'dnf' + config_opts['nosync'] = True ++config_opts['use_bootstrap_container'] = False + + config_opts['yum.conf'] = \"\"\" + $yum_conf diff --git a/module-build-service.spec b/module-build-service.spec index e993e64..0ae476c 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,12 +1,13 @@ Name: module-build-service Version: 1.3.21 -Release: 1%{?dist} +Release: 2%{?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 %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -120,6 +121,8 @@ for a number of tasks: %prep %setup -q +%patch0 -p1 + # Simply remove an old .pyc file that was included in one release. rm -f module_build_service/scheduler/consumer.pyc # And this weird sqlite file that made it in... @@ -168,6 +171,9 @@ done %changelog +* Tue May 09 2017 Jan Kaluza - 1.3.21-2 +- fix the compatibility with new Mock + * Tue May 02 2017 Jan Kaluza - 1.3.21-1 - new version