Hello community,
here is the log from the commit of package pesign-obs-integration for
openSUSE:Factory checked in at 2020-09-05 23:57:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pesign-obs-integration (Old)
and /work/SRC/openSUSE:Factory/.pesign-obs-integration.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pesign-obs-integration"
Sat Sep 5 23:57:41 2020 rev:40 rq:831367 version:10.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/pesign-obs-integration/pesign-obs-integration.changes
2020-07-21 15:45:09.367903610 +0200
+++
/work/SRC/openSUSE:Factory/.pesign-obs-integration.new.3399/pesign-obs-integration.changes
2020-09-05 23:57:50.147116633 +0200
@@ -1,0 +2,6 @@
+Wed Sep 2 03:39:46 UTC 2020 - Gary Ching-Pang Lin <g...@suse.com>
+
+- Add 0001-Forward-_binary_payload-to-the-repackaged-rpm.patch to
+ forward _binary_payload to the repackaged rpm (bsc#1175882)
+
+-------------------------------------------------------------------
New:
----
0001-Forward-_binary_payload-to-the-repackaged-rpm.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pesign-obs-integration.spec ++++++
--- /var/tmp/diff_new_pack.wUdF3l/_old 2020-09-05 23:57:51.239117179 +0200
+++ /var/tmp/diff_new_pack.wUdF3l/_new 2020-09-05 23:57:51.243117182 +0200
@@ -42,6 +42,7 @@
# https://github.com/openSUSE/pesign-obs-integration/pull/18
Patch7: pesign-sign-s390x-kernel.patch
Patch8: 0001-Enable-find_provides-and-requires.patch
+Patch9: 0001-Forward-_binary_payload-to-the-repackaged-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# suse-module-tools <= 15.0.10 contains modsign-verify
Requires: suse-module-tools >= 15.0.10
@@ -60,6 +61,7 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
++++++ 0001-Forward-_binary_payload-to-the-repackaged-rpm.patch ++++++
>From 8c1a628d671e58a3902bda1389a871a154b27469 Mon Sep 17 00:00:00 2001
From: Gary Lin <g...@suse.com>
Date: Wed, 2 Sep 2020 11:37:24 +0800
Subject: [PATCH] Forward _binary_payload to the repackaged rpm (bsc#1175882)
Signed-off-by: Gary Lin <g...@suse.com>
---
pesign-gen-repackage-spec | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/pesign-gen-repackage-spec b/pesign-gen-repackage-spec
index e1ca24c..037da59 100755
--- a/pesign-gen-repackage-spec
+++ b/pesign-gen-repackage-spec
@@ -142,15 +142,25 @@ my %script2tag = (
# FIXME: triggers
);
+# compressor => specfile payload
+my %com2pl = (
+ gzip => "gzdio",
+ bzip2 => "bzdio",
+ xz => "xzdio",
+ lzma => "lzdio",
+ zstd => "zstdio",
+);
+
# tags which are printed verbatim in the specfile
my @simple_tags = qw(version release license group summary packager vendor
url distribution);
+my @payload_tags = qw(payloadcompressor payloadflags);
sub load_package {
my $rpm = shift;
my %res;
- for my $tag (qw(name arch sourcerpm description), @simple_tags) {
+ for my $tag (qw(name arch sourcerpm description), @simple_tags,
@payload_tags) {
$res{$tag} = query_single($rpm, $tag);
}
my @files;
@@ -245,6 +255,18 @@ sub print_script {
sub print_package {
my ($p, $is_main) = @_;
+ my $payloadstr = "w.ufdio";
+
+ if ($p->{payloadcompressor}) {
+ my $payload = $com2pl{$p->{payloadcompressor}};
+ if ($payload) {
+ $payloadstr = "w$p->{payloadflags}.$payload";
+ } else {
+ die "Unknown compressor: $p->{payloadcompressor}";
+ }
+ }
+ print SPEC "\%define _binary_payload $payloadstr\n";
+
if ($is_main) {
print SPEC "Name: $p->{name}\n";
print SPEC "Buildroot: $directory\n";
--
2.28.0
