Hello community,
here is the log from the commit of package product-builder for
openSUSE:Leap:15.2 checked in at 2020-03-20 05:52:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/product-builder (Old)
and /work/SRC/openSUSE:Leap:15.2/.product-builder.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder"
Fri Mar 20 05:52:14 2020 rev:78 rq:781743 version:1.2.9
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/product-builder/product-builder.changes
2020-03-02 17:21:51.750122939 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.product-builder.new.3160/product-builder.changes
2020-03-20 05:52:21.584041635 +0100
@@ -1,0 +2,12 @@
+Fri Feb 28 11:02:19 UTC 2020 - Adrian Schröter <adr...@suse.de>
+
+- 1.2.9
+ * fix "multiple kiwi files" error for Full media
+
+-------------------------------------------------------------------
+Wed Feb 26 13:23:16 UTC 2020 - Adrian Schröter <adr...@suse.de>
+
+- 1.2.8
+ * keep kwd file in SLE Full media wrapper (bsc#1164670)
+
+-------------------------------------------------------------------
Old:
----
product-builder-1.2.7.obscpio
New:
----
product-builder-1.2.9.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder.spec ++++++
--- /var/tmp/diff_new_pack.3cE1Yt/_old 2020-03-20 05:52:22.048041944 +0100
+++ /var/tmp/diff_new_pack.3cE1Yt/_new 2020-03-20 05:52:22.048041944 +0100
@@ -1,7 +1,7 @@
#
# spec file for package product-builder
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,11 @@
Summary: SUSE Product Builder
License: GPL-2.0-only
Group: System/Management
-Url: http://github.com/openSUSE/product-builder
+URL: http://github.com/openSUSE/product-builder
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version: 1.2.7
+Version: 1.2.9
Release: 0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++++++ _service ++++++
--- /var/tmp/diff_new_pack.3cE1Yt/_old 2020-03-20 05:52:22.072041960 +0100
+++ /var/tmp/diff_new_pack.3cE1Yt/_new 2020-03-20 05:52:22.072041960 +0100
@@ -1,8 +1,8 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="url">https://github.com/openSUSE/product-builder.git</param>
- <param name="revision">1.2.7</param>
- <param name="version">1.2.7</param>
+ <param name="revision">1.2.9</param>
+ <param name="version">1.2.9</param>
<param name="scm">git</param>
<param name="extract">rpm/product-builder.spec</param>
</service>
++++++ product-builder-1.2.7.obscpio -> product-builder-1.2.9.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.7/SLE-wrapper.sh
new/product-builder-1.2.9/SLE-wrapper.sh
--- old/product-builder-1.2.7/SLE-wrapper.sh 2020-02-05 13:05:47.000000000
+0100
+++ new/product-builder-1.2.9/SLE-wrapper.sh 2020-02-28 11:09:58.000000000
+0100
@@ -33,6 +33,9 @@
perl -e '$in=0; while (<STDIN>) { $in=1 if /<instrepo /; print $_ unless
$in; if (m,</instrepo,) { $in=0; system("cat expanded_instsources.include") };
}' < $kiwi > config.xml
sed -i
"s,MEDIUM_NAME\">.*,MEDIUM_NAME\">$MN-$BUILD_SUFFIX-Media</productvar><productvar
name=\"BUILD_ID\">$MN-$BUILD_SUFFIX</productvar>," config.xml
+ # rescue support flags
+ cp ${kiwi%.kiwi}.kwd config.kwd
+
/usr/bin/product-builder.pl --root $TOPDIR/KIWIROOT/ -v 1 --logfile
terminal --create-instsource . || exit 1
mv $TOPDIR/KIWIROOT/main $TOPDIR/KIWIALL/$MN_SHORT
rm -rf $TOPDIR/KIWIROOT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.7/modules/KIWICollect.pm
new/product-builder-1.2.9/modules/KIWICollect.pm
--- old/product-builder-1.2.7/modules/KIWICollect.pm 2020-02-05
13:05:47.000000000 +0100
+++ new/product-builder-1.2.9/modules/KIWICollect.pm 2020-02-28
11:09:58.000000000 +0100
@@ -1349,6 +1349,7 @@
my %supporthash;
my $supportfile = abs_path($this->{m_xml}->{xmlOrigFile});
$supportfile =~ s/.kiwi$/.kwd/;
+ $supportfile =~ s/.xml$/.kwd/;
if ( -e $supportfile ) {
my $support_fd = FileHandle -> new();
if (! $support_fd -> open ($supportfile)) {
++++++ product-builder.obsinfo ++++++
--- /var/tmp/diff_new_pack.3cE1Yt/_old 2020-03-20 05:52:22.180042032 +0100
+++ /var/tmp/diff_new_pack.3cE1Yt/_new 2020-03-20 05:52:22.180042032 +0100
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.7
-mtime: 1580904347
-commit: 2fa0d07906bffbde3df7cef265301ecd08d85027
+version: 1.2.9
+mtime: 1582884598
+commit: ea6316a55b185c14a6b04c347b1b463f211d3fc7
