File 0001-approach-issue-22-false-noarch-subpackage.... of Package pesign-obs-integration.20743

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-approach-issue-22-false-noarch-subpackage.patch of Package pesign-obs-integration.20743

From 9f6c6fdef2cb082e1ad270cf3d984798e061ca8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Oertel?= <ro@suse.de>
Date: Fri, 18 Dec 2020 14:19:34 +0100
Subject: [PATCH] approach issue#22 false noarch subpackage

if there is no main packge, do not make the artificial
main package noarch unless all subpacks are noarch.
---
 pesign-gen-repackage-spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pesign-gen-repackage-spec b/pesign-gen-repackage-spec
index 22a1c47..8a1fe39 100755
--- a/pesign-gen-repackage-spec
+++ b/pesign-gen-repackage-spec
@@ -494,10 +494,16 @@ if (!exists($packages{$main_name})) {
 		version => $main_ver,
 		release => $main_rel,
 	};
-	for my $tag (qw(description changelog arch), @simple_tags) {
+	for my $tag (qw(description changelog), @simple_tags) {
 		next if $packages{$main_name}->{$tag};
 		$packages{$main_name}->{$tag} = $packages{$first}->{$tag};
 	}
+	my $main_arch = "noarch";
+	for my $subpack (keys(%packages)) {
+	    my $cur_arch = $packages{$subpack}->{'arch'};
+	    $main_arch = $cur_arch if $cur_arch && $cur_arch ne "noarch";
+	}
+	$packages{$main_name}->{'arch'} = $main_arch unless $packages{$main_name}->{'arch'};
 }
 $packages{$main_name}->{nosource} = $nosrc ? 1 : 0;
 
-- 
2.29.2

Places

File 0001-approach-issue-22-false-noarch-subpackage.patch of Package pesign-obs-integration.20743

Places