From 6abb585cdcc56c6c8ec139526a374c4f4201d503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Mon, 3 Dec 2018 11:44:06 +0100 Subject: [PATCH] Define ModularityLabel RPM header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We intend to stop using the DistTag header and replace it with ModularityLabel. Upstream RPM already supports it but it is not yet available in Fedora. Related Modularity ticket: https://pagure.io/modularity/issue/113 Related RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1650286 For the time being, we need to keep both. Signed-off-by: Petr Šabata --- module_build_service/builder/KojiModuleBuilder.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py index 35755113..ec2401df 100644 --- a/module_build_service/builder/KojiModuleBuilder.py +++ b/module_build_service/builder/KojiModuleBuilder.py @@ -339,6 +339,7 @@ class KojiModuleBuilder(GenericBuilder): spec_content = """ %global dist {disttag} %global disttag module({module_name}:{module_stream}:{module_version}:{module_context}) +%global modularitylabel {module_name}:{module_stream}:{module_version}:{module_context} %global _module_name {module_name} %global _module_stream {module_stream} %global _module_version {module_version} @@ -401,6 +402,7 @@ chmod 644 %buildroot/etc/rpm/macros.zz-modules %dist {disttag} %disttag module({module_name}:{module_stream}:{module_version}:{module_context}) +%modularitylabel {module_name}:{module_stream}:{module_version}:{module_context} %_module_build 1 %_module_name {module_name} %_module_stream {module_stream}