modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-05 19:57:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Define ModularityLabel RPM header

Browse Source 
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 <contyk@redhat.com>
This commit is contained in:
Petr Šabata
2018-12-03 11:44:06 +01:00
parent 66a76f4fcd
commit 6abb585cdc
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module_build_service/builder/KojiModuleBuilder.py
View File

@@ -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}