Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package instsource-susedata for
openSUSE:Factory checked in at 2021-04-18 21:45:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/instsource-susedata (Old)
and /work/SRC/openSUSE:Factory/.instsource-susedata.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "instsource-susedata"
Sun Apr 18 21:45:07 2021 rev:10 rq:885720 version:0.3.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/instsource-susedata/instsource-susedata.changes
2020-05-02 22:15:29.572304198 +0200
+++
/work/SRC/openSUSE:Factory/.instsource-susedata.new.12324/instsource-susedata.changes
2021-04-18 21:45:17.268739839 +0200
@@ -1,0 +2,6 @@
+Thu Apr 15 16:18:09 CEST 2021 - [email protected]
+
+- update to version 0.3.6
+ * add option to add gpg keys as content tags (bsc#1184326)
+
+-------------------------------------------------------------------
Old:
----
instsource-susedata-0.3.5.obscpio
New:
----
instsource-susedata-0.3.6.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ instsource-susedata.spec ++++++
--- /var/tmp/diff_new_pack.eVQBAi/_old 2021-04-18 21:45:17.852740827 +0200
+++ /var/tmp/diff_new_pack.eVQBAi/_new 2021-04-18 21:45:17.856740834 +0200
@@ -1,7 +1,7 @@
#
# spec file for package instsource-susedata
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Summary: Utility to add susedata to repomd metadata
License: GPL-2.0-only
Group: System/Management
-Version: 0.3.5
+Version: 0.3.6
Release: 0
Source: %{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ _service ++++++
--- /var/tmp/diff_new_pack.eVQBAi/_old 2021-04-18 21:45:17.912740928 +0200
+++ /var/tmp/diff_new_pack.eVQBAi/_new 2021-04-18 21:45:17.912740928 +0200
@@ -2,8 +2,8 @@
<service name="obs_scm" mode="disabled">
<param
name="url">https://github.com/openSUSE/instsource-susedata.git</param>
<param name="scm">git</param>
- <param name="version">0.3.5</param>
- <param name="revision">0.3.5</param>
+ <param name="version">0.3.6</param>
+ <param name="revision">0.3.6</param>
<param name="extract">instsource-susedata.changes</param>
<param name="extract">instsource-susedata.spec</param>
</service>
++++++ instsource-susedata-0.3.5.obscpio -> instsource-susedata-0.3.6.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/instsource-susedata-0.3.5/add_product_susedata
new/instsource-susedata-0.3.6/add_product_susedata
--- old/instsource-susedata-0.3.5/add_product_susedata 2020-04-30
12:08:52.000000000 +0200
+++ new/instsource-susedata-0.3.6/add_product_susedata 2021-04-15
16:18:57.000000000 +0200
@@ -111,14 +111,16 @@
our $opt_u;
our $opt_h;
our $opt_p;
+our $opt_g;
-&getopts("k:e:d:uph") || die "ERROR: No such option. -h for help\n";
+&getopts("k:e:d:upgh") || die "ERROR: No such option. -h for help\n";
&usage if ($opt_h);
sub usage(){
print "\nUsage: $0 [-h][-u][-v VERSION][-k KWDFILE][-e EULADIR][-d
REPOPATH]\n\n";
print " -u use unique filenames\n";
print " -p add diskusage data\n";
+ print " -g add gpg key tags\n";
print " -k = path to keyword file\n";
print " -e = path to eula directory\n";
print " -d = path to repository\n";
@@ -237,12 +239,14 @@
my $repo_dir;
my $unique_filenames;
my $diskusage;
+my $gpgkeys;
$eula_dir = $opt_e if $opt_e;
$kwd_file = $opt_k if $opt_k;
$repo_dir = $opt_d if $opt_d;
$unique_filenames = 1 if $opt_u;
$diskusage = 1 if $opt_p;
+$gpgkeys = 1 if $opt_g;
die "no repository specified" unless $repo_dir;
print "no eulas or keywords, translations only\n" unless $eula_dir ||
$kwd_file;
@@ -305,7 +309,7 @@
for $p (@{$pack->{'format'}->{'rpm:provides'}->{'rpm:entry'}}) {
next unless $p->{'name'} eq 'pattern-category()';
$data->{'pattern-category'} = uri_unescape($p->{'ver'});
- break; # we expect only one category
+ last; # we expect only one category
}
}
if ($keyword_data->{$pack->{'name'}}) {
@@ -350,7 +354,7 @@
for $p (@{$pack->{'format'}->{'rpm:provides'}->{'rpm:entry'}}) {
next unless $p->{'name'} eq 'pattern-category()';
$category = uri_unescape($p->{'ver'});
- break; # we expect only one category
+ last; # we expect only one category
}
}
my $i18n_summary = gettext($summary);
@@ -410,6 +414,19 @@
$repomd->{'data'} = \@new_repomd_data;
+if ($gpgkeys) {
+ my @new_repomd_tags_content;
+ @new_repomd_tags_content = grep { $_ !~ /^gpg-pubkey/ }
@{$repomd->{'tags'}->{'content'}} if $repomd->{'tags'} &&
$repomd->{'tags'}->{'content'};
+ print "INFO: adding gpg key tags\n";
+ opendir(DIR,"$repo_dir") || die "ERROR: could not open repo base
directory\n";
+ for (readdir(DIR)) {
+ next unless /^gpg-pubkey-/;
+ push @new_repomd_tags_content, $_;
+ }
+ closedir(DIR);
+ $repomd->{'tags'}->{'content'} = \@new_repomd_tags_content if
@new_repomd_tags_content;
+}
+
open (REPOMD, ">", "$repo_dir/repodata/repomd.xml");
print REPOMD "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
print REPOMD XMLout($ABXML::repomd, $repomd);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/instsource-susedata-0.3.5/instsource-susedata.changes
new/instsource-susedata-0.3.6/instsource-susedata.changes
--- old/instsource-susedata-0.3.5/instsource-susedata.changes 2020-04-30
12:08:52.000000000 +0200
+++ new/instsource-susedata-0.3.6/instsource-susedata.changes 2021-04-15
16:18:57.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Apr 15 16:18:09 CEST 2021 - [email protected]
+
+- update to version 0.3.6
+ * add option to add gpg keys as content tags (bsc#1184326)
+
+-------------------------------------------------------------------
Wed Apr 29 00:27:25 CEST 2020 - [email protected]
- update to version 0.3.5
++++++ instsource-susedata.obsinfo ++++++
--- /var/tmp/diff_new_pack.eVQBAi/_old 2021-04-18 21:45:18.048741159 +0200
+++ /var/tmp/diff_new_pack.eVQBAi/_new 2021-04-18 21:45:18.048741159 +0200
@@ -1,5 +1,5 @@
name: instsource-susedata
-version: 0.3.5
-mtime: 1588241332
-commit: 04b9a23c477c3753790bc8a3929bd9f02f6158cb
+version: 0.3.6
+mtime: 1618496337
+commit: df5bc64e2482c1d2246392061b8b89a471a166e0
