From 777cdab0613a8047ec7df8f978d296021341e2da Mon Sep 17 00:00:00 2001 From: mprahl Date: Oct 12 2018 11:48:42 +0000 Subject: Release v2.7.0 --- diff --git a/.gitignore b/.gitignore index 22e8899..b3d33f6 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /module-build-service-2.4.2.tar.gz /module-build-service-2.5.0.tar.gz /module-build-service-2.6.0.tar.gz +/module-build-service-2.7.0.tar.gz diff --git a/1013.patch b/1013.patch deleted file mode 100644 index 4779b78..0000000 --- a/1013.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3a601d27de845907e2e11411589321e28c8604b7 Mon Sep 17 00:00:00 2001 -From: Ralph Bean -Date: Sep 11 2018 00:47:55 +0000 -Subject: Fix bug breaking local builds. - - -This bug was reported by @nphillip here https://bodhi.fedoraproject.org/updates/FEDORA-2018-c9c3a37d96 - -The issue is that the `record_filtered_rpms` method returns a new xmd -buildrequires block, but whole buildrequires entries were omitted in the return -value for local builds. This one-liner includes them again. - ---- - -diff --git a/module_build_service/utils/submit.py b/module_build_service/utils/submit.py -index 95f3060..ac70440 100644 ---- a/module_build_service/utils/submit.py -+++ b/module_build_service/utils/submit.py -@@ -59,6 +59,7 @@ def record_filtered_rpms(mmd): - # In case this is module resubmit or local build, the filtered_rpms - # will already be there, so there is no point in generating them again. - if "filtered_rpms" in req_data: -+ new_buildrequires[req_name] = req_data - continue - - # We can just get the first modulemd data from result right here thanks to - diff --git a/module-build-service.spec b/module-build-service.spec index 6ee5c34..3b99bec 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -4,16 +4,14 @@ %endif Name: module-build-service -Version: 2.6.0 -Release: 2%{?dist} +Version: 2.7.0 +Release: 1%{?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 -# https://pagure.io/fm-orchestrator/pull-request/1013.patch -Patch0: 1013.patch BuildArch: noarch @@ -297,6 +295,9 @@ done %changelog +* Fri Oct 12 2018 Matt Prahl - 2.7.0-1 +- new version + * Mon Sep 10 2018 Ralph Bean - 2.6.0-2 - Apply https://pagure.io/fm-orchestrator/pull-request/1013.patch diff --git a/sources b/sources index 5356f3b..3cfda8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-2.6.0.tar.gz) = cfb8b1e5b1e86e0ee052c9a2aa96d31c77d7f1f10e6f2097e62b478c2f6985ccf93a4dd72203d57f13b8d7c68bcdca9b68f267703bd3fd0eb89e8969773e581c +SHA512 (module-build-service-2.7.0.tar.gz) = 71eef093725aaa16f57b800684ad992102dab9a6d758c9ff3fe1eee793556b1cac05a299dc5e24f023fc56eb0373d4db4a8c4155c774a77d02d9edb55b9fa154