Hello community,
here is the log from the commit of package instsource-susedata for
openSUSE:Factory checked in at 2018-12-19 13:22:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/instsource-susedata (Old)
and /work/SRC/openSUSE:Factory/.instsource-susedata.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "instsource-susedata"
Wed Dec 19 13:22:54 2018 rev:8 rq:655521 version:0.3.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/instsource-susedata/instsource-susedata.changes
2018-04-26 13:35:14.542212821 +0200
+++
/work/SRC/openSUSE:Factory/.instsource-susedata.new.28833/instsource-susedata.changes
2018-12-19 13:22:56.305416883 +0100
@@ -1,0 +2,6 @@
+Wed Dec 5 14:58:23 UTC 2018 - Adrian Schröter <[email protected]>
+
+- update to version 0.3.4
+ * Add pattern-category (fate#323785)
+
+-------------------------------------------------------------------
Old:
----
instsource-susedata-0.3.3.obscpio
New:
----
instsource-susedata-0.3.4.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ instsource-susedata.spec ++++++
--- /var/tmp/diff_new_pack.Jk7sQS/_old 2018-12-19 13:22:56.721416375 +0100
+++ /var/tmp/diff_new_pack.Jk7sQS/_new 2018-12-19 13:22:56.725416370 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -20,7 +20,7 @@
Summary: Utility to add susedata to repomd metadata
License: GPL-2.0-only
Group: System/Management
-Version: 0.3.3
+Version: 0.3.4
Release: 0
Source: %{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -31,9 +31,11 @@
%endif
BuildRequires: inst-source-utils
BuildRequires: perl(Locale::gettext)
+BuildRequires: perl(URI::Escape)
BuildRequires: perl(XML::Structured)
Requires: inst-source-utils
Requires: perl(Locale::gettext)
+Requires: perl(URI::Escape)
Requires: perl(XML::Structured)
Supplements: kiwi-instsource
BuildArch: noarch
@@ -44,7 +46,7 @@
%prep
%setup -q
-%build
+%check
perl -wc add_product_susedata || exit 1
%install
@@ -52,8 +54,7 @@
install -m 755 add_product_susedata $RPM_BUILD_ROOT/usr/bin
%files
-%defattr(-, root, root)
-%doc COPYING
+%license COPYING
/usr/bin/add_product_susedata
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Jk7sQS/_old 2018-12-19 13:22:56.745416346 +0100
+++ /var/tmp/diff_new_pack.Jk7sQS/_new 2018-12-19 13:22:56.745416346 +0100
@@ -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.3</param>
- <param name="revision">0.3.3</param>
+ <param name="version">0.3.4</param>
+ <param name="revision">0.3.4</param>
<param name="extract">instsource-susedata.changes</param>
<param name="extract">instsource-susedata.spec</param>
</service>
++++++ instsource-susedata-0.3.3.obscpio -> instsource-susedata-0.3.4.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/instsource-susedata-0.3.3/add_product_susedata
new/instsource-susedata-0.3.4/add_product_susedata
--- old/instsource-susedata-0.3.3/add_product_susedata 2018-04-24
12:00:01.000000000 +0200
+++ new/instsource-susedata-0.3.4/add_product_susedata 2018-12-05
15:58:44.000000000 +0100
@@ -17,6 +17,7 @@
use Data::Dumper;
use Locale::gettext;
use POSIX; # Needed for setlocale()
+use URI::Escape;
my $checksum_type = "SHA-256";
@@ -300,6 +301,13 @@
for my $field (qw(name arch version)) {
$data->{$field} = $pack->{$field};
}
+ if ($pack->{'format'}->{'rpm:provides'}->{'rpm:entry'}) {
+ 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
+ }
+ }
if ($keyword_data->{$pack->{'name'}}) {
push @{$data->{'keyword'}}, { '_content' => $_ } for
@{$keyword_data->{$pack->{'name'}}};
}
@@ -308,7 +316,7 @@
my $du = calcdudata("$repo_dir/$pkgpath", 3);
$data->{'diskusage'} = $du if $du;
}
- next unless $data->{'keyword'} || $data->{'eula'} || $data->{'diskusage'};
+ next unless $data->{'keyword'} || $data->{'eula'} || $data->{'diskusage'} ||
$data->{'pattern-category'};
push @suse, $data;
}
@@ -337,13 +345,23 @@
my $pkgid = (grep {$_->{'pkgid'}} @{$pack->{'checksum'}})[0]->{'_content'};
my $summary = $pack->{'summary'}[0]->{'_content'};
my $description = $pack->{'description'}[0]->{'_content'};
+ my $category;
+ if ($pack->{'format'}->{'rpm:provides'}->{'rpm:entry'}) {
+ 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
+ }
+ }
my $i18n_summary = gettext($summary);
my $i18n_description = gettext($description);
+ my $i18n_category = $category?gettext($category):undef;
my $eula_key = $pack->{'name'}.".".$language;
$data->{'eula'} = str2utf8xml($eula_data->{$eula_key}) if $eula_data &&
$eula_data->{$eula_key};
$data->{'summary'} = { 'lang' => $language, '_content' => $i18n_summary }
if $summary ne '' && $summary ne $i18n_summary;
$data->{'description'} = { 'lang' => $language, '_content' =>
$i18n_description } if $description ne '' && $description ne $i18n_description;
+ $data->{'pattern-category'} = { 'lang' => $language, '_content' =>
$i18n_category } if $category && $category ne $i18n_category;
next unless $data;
$data->{'pkgid'} = $pkgid;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/instsource-susedata-0.3.3/instsource-susedata.changes
new/instsource-susedata-0.3.4/instsource-susedata.changes
--- old/instsource-susedata-0.3.3/instsource-susedata.changes 2018-04-24
12:00:01.000000000 +0200
+++ new/instsource-susedata-0.3.4/instsource-susedata.changes 2018-12-05
15:58:44.000000000 +0100
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Wed Dec 5 14:58:23 UTC 2018 - Adrian Schröter <[email protected]>
+
+- update to version 0.3.4
+ * Add pattern-category (fate#323785)
+
+-------------------------------------------------------------------
+Tue Apr 24 11:31:39 UTC 2018 - [email protected]
+
+- update to version 0.3.3
+ * fix missing perl depency
+ * dependency check during build
+
+-------------------------------------------------------------------
Tue Apr 17 09:23:48 UTC 2018 - [email protected]
- update to version 0.3.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/instsource-susedata-0.3.3/instsource-susedata.spec
new/instsource-susedata-0.3.4/instsource-susedata.spec
--- old/instsource-susedata-0.3.3/instsource-susedata.spec 2018-04-24
12:00:01.000000000 +0200
+++ new/instsource-susedata-0.3.4/instsource-susedata.spec 2018-12-05
15:58:44.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package instsource-susedata
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +18,9 @@
Name: instsource-susedata
Summary: Utility to add susedata to repomd metadata
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/Management
-Version: 0.1
+Version: 0.3.3
Release: 0
Source: %{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -29,11 +29,12 @@
%else
Requires: SLE-EULAs
%endif
-BuildRequires: perl(XML::Structured)
+BuildRequires: inst-source-utils
BuildRequires: perl(Locale::gettext)
-Requires: perl(XML::Structured)
-Requires: perl(Locale::gettext)
+BuildRequires: perl(XML::Structured)
Requires: inst-source-utils
+Requires: perl(Locale::gettext)
+Requires: perl(XML::Structured)
Supplements: kiwi-instsource
BuildArch: noarch
++++++ instsource-susedata.obsinfo ++++++
--- /var/tmp/diff_new_pack.Jk7sQS/_old 2018-12-19 13:22:56.817416258 +0100
+++ /var/tmp/diff_new_pack.Jk7sQS/_new 2018-12-19 13:22:56.821416254 +0100
@@ -1,5 +1,5 @@
name: instsource-susedata
-version: 0.3.3
-mtime: 1524564001
-commit: b4a4206541b2f514f5224a6ac671dbe1062efc49
+version: 0.3.4
+mtime: 1544021924
+commit: b394fd74d7a653c9b8be0ba043c01c84b3c23d1a
