diff --git a/.gitignore b/.gitignore index 5cf571b..8cec86b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /module-build-service-1.3.24.tar.gz /module-build-service-1.3.25.tar.gz /module-build-service-1.3.26.tar.gz +/module-build-service-1.3.27.tar.gz diff --git a/0001-manager-skiptests-is-not-positional-argument.patch b/0001-manager-skiptests-is-not-positional-argument.patch deleted file mode 100644 index 539e194..0000000 --- a/0001-manager-skiptests-is-not-positional-argument.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 99a6c03507e496df67c9f2eecd0585e891fb0ad4 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sun, 3 Sep 2017 13:20:37 +0200 -Subject: [PATCH] manager: skiptests is not positional argument - -mbs-build adds --skiptests option, but mbs-manager thinks that skiptests -is positional argument. - -Fixes: aac4227eb83b8146487c415fee4267d22baad506 -Signed-off-by: Igor Gnatenko ---- - module_build_service/manage.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/module_build_service/manage.py b/module_build_service/manage.py -index 2e76424..e915f7d 100755 ---- a/module_build_service/manage.py -+++ b/module_build_service/manage.py -@@ -118,7 +118,7 @@ def cleardb(): - - @manager.option('branch') - @manager.option('url') --@manager.option('skiptests', action='store_true') -+@manager.option('--skiptests', action='store_true') - @manager.option('-l', '--add-local-build', action='append', default=None, dest='local_build_nsvs') - def build_module_locally(url, branch, local_build_nsvs=None, skiptests=False): - """ Performs local module build using Mock diff --git a/0001-utils-unbreak-building-packages-when-tests-are-skipp.patch b/0001-utils-unbreak-building-packages-when-tests-are-skipp.patch deleted file mode 100644 index 2b47227..0000000 --- a/0001-utils-unbreak-building-packages-when-tests-are-skipp.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ee1176f444571f98132393c65e800d1c128831f7 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sun, 3 Sep 2017 12:22:11 +0200 -Subject: [PATCH] utils: unbreak building packages when tests are skipped -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Just replacing %check macro is ¤&%¤#%&¤%¤. I'm not going to -add any more words on it. - -It breaks building many packages. - -Fixes: 5391e7c9afb709a5bed0d920d0cc9e346537976c -Signed-off-by: Igor Gnatenko ---- - module_build_service/utils.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/module_build_service/utils.py b/module_build_service/utils.py -index 9d6d173..70dbe14 100644 ---- a/module_build_service/utils.py -+++ b/module_build_service/utils.py -@@ -908,7 +908,7 @@ def submit_module_build_from_scm(username, url, branch, allow_local_url=False, - url = "file://" + url - mmd, scm, yaml = _fetch_mmd(url, branch, allow_local_url) - if skiptests: -- mmd.buildopts.rpms.macros += "\n\n%check exit 0\n" -+ mmd.buildopts.rpms.macros += "\n\n%__spec_check_pre exit 0\n" - return submit_module_build(username, url, mmd, scm, yaml, optional_params) - - diff --git a/mbs-build-trailing-slash.patch b/mbs-build-trailing-slash.patch deleted file mode 100644 index 45ba48d..0000000 --- a/mbs-build-trailing-slash.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/contrib/mbs-build b/contrib/mbs-build -index 9e4e030..d4d0593 100755 ---- a/contrib/mbs-build -+++ b/contrib/mbs-build -@@ -21,7 +21,7 @@ except ImportError: - - DEFAULT_ID_PROVIDER = "https://id.fedoraproject.org/openidc/" - DEFAULT_MBS_SERVER = "https://mbs.fedoraproject.org" --DEFAULT_MBS_REST_API = "/module-build-service/1/module-builds" -+DEFAULT_MBS_REST_API = "/module-build-service/1/module-builds/" - DEFAULT_KOJI_TASK_URL = "https://koji.fedoraproject.org/koji/taskinfo" - - openidc_client.WEB_PORTS = [13747] diff --git a/module-build-service.spec b/module-build-service.spec index 2aabdad..364571d 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service -Version: 1.3.26 -Release: 5%{?dist} +Version: 1.3.27 +Release: 1%{?dist} Summary: The Module Build Service for Modularity @@ -9,11 +9,6 @@ License: MIT URL: https://pagure.io/fm-orchestrator Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz Patch0: mbs-no-mbsbuild.patch -Patch1: mbs-build-trailing-slash.patch -# https://pagure.io/fm-orchestrator/pull-request/662 -Patch2: 0001-utils-unbreak-building-packages-when-tests-are-skipp.patch -# https://pagure.io/fm-orchestrator/pull-request/663 -Patch3: 0001-manager-skiptests-is-not-positional-argument.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -168,9 +163,6 @@ for a number of tasks: %patch0 -p1 %endif -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %py2_build @@ -214,6 +206,9 @@ done %exclude %{python2_sitelib}/tests/ %changelog +* Tue Sep 12 2017 Ralph Bean - 1.3.27-1 +- new version + * Tue Sep 05 2017 Igor Gnatenko - 1.3.26-5 - Really apply patches diff --git a/sources b/sources index 9b90f26..d94ae8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-1.3.26.tar.gz) = a0c1117fc22239bc0bd837a38116816c0f27474eb345fd61ecf0635062c727861f3430f0b943facc07241b19e205011efd03ce64d9eef545d27a25c601e726ee +SHA512 (module-build-service-1.3.27.tar.gz) = 1c447fc999559d2ac4d9b4526e91fa19989943d59822ef543e269350ceaf71e5bf5d00247982f48d0eee04d1f92865426966a2eea7f4734df7ea050c432ac364