Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2018-03-20 21:53:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder"
Tue Mar 20 21:53:41 2018 rev:18 rq:586163 version:1.0.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2018-03-06 10:43:51.411721563 +0100
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2018-03-20 21:53:48.771826376 +0100
@@ -1,0 +2,15 @@
+Tue Mar 13 05:45:03 UTC 2018 - co...@suse.com
+
+- 1.0.7
+ * fix ppc64le (related to bsc#1084893)
+- align with SLE changes file (add accept_old_meta_package.patch)
+
+-------------------------------------------------------------------
+Thu Mar 8 08:48:41 UTC 2018 - adr...@suse.de
+
+- 1.0.6
+ * fixed platform ID for EFI boot (bsc#1081739)
+- fix dependencies to mkisofs
+- using spec file from git now
+
+-------------------------------------------------------------------
Old:
----
product-builder-1.0.5.obscpio
New:
----
product-builder-1.0.7.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder.spec ++++++
--- /var/tmp/diff_new_pack.ijjvNv/_old 2018-03-20 21:53:49.779790081 +0100
+++ /var/tmp/diff_new_pack.ijjvNv/_new 2018-03-20 21:53:49.783789937 +0100
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version: 1.0.5
+Version: 1.0.7
Release: 0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
@@ -46,8 +46,8 @@
Provides: system-packages:kiwi-product
Requires: build
Requires: checkmedia
-Requires: genisoimage
Requires: inst-source-utils
+Requires: mkisofs
Requires: product-builder-plugin
%ifarch %ix86 x86_64
Requires: syslinux
@@ -61,7 +61,7 @@
%prep
%setup -q
-%if 0%{?suse_version} == 1330 || 0%{?skelcd_compat}
+%if 0%{?skelcd_compat}
%patch1 -p1
%endif
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ijjvNv/_old 2018-03-20 21:53:49.819788641 +0100
+++ /var/tmp/diff_new_pack.ijjvNv/_new 2018-03-20 21:53:49.823788497 +0100
@@ -1,9 +1,10 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="url">https://github.com/openSUSE/product-builder.git</param>
- <param name="revision">1.0.5</param>
- <param name="version">1.0.5</param>
+ <param name="revision">1.0.7</param>
+ <param name="version">1.0.7</param>
<param name="scm">git</param>
+ <param name="extract">rpm/product-builder.spec</param>
</service>
<service mode="disabled" name="set_version"/>
<service mode="buildtime" name="tar" />
++++++ product-builder-1.0.5.obscpio -> product-builder-1.0.7.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.0.5/modules/KIWIIsoLinux.pm
new/product-builder-1.0.7/modules/KIWIIsoLinux.pm
--- old/product-builder-1.0.5/modules/KIWIIsoLinux.pm 2018-03-02
09:28:45.000000000 +0100
+++ new/product-builder-1.0.7/modules/KIWIIsoLinux.pm 2018-03-13
06:41:14.000000000 +0100
@@ -158,9 +158,12 @@
if ($arch eq "ix86") {
$catalog[0] = "ix86_legacy";
}
- if ($arch =~ /ppc64|ppc64le/) {
+ if ($arch eq "ppc64") {
$catalog[0] = "ppc64_default";
}
+ if ($arch eq "ppc64le") {
+ $catalog[0] = "ppc64le_default";
+ }
if ($arch eq "s390") {
if (-d $source."/".$base{ix86}{boot}) {
$catalog[0] = "ix86_legacy";
@@ -307,6 +310,7 @@
my $boot = $base{$arch}{boot};
my $loader= $base{$arch}{efi};
$para.= " -eltorito-alt-boot";
+ $para.= " -eltorito-platform efi";
$para.= " -no-emul-boot";
$para.= " -boot-load-size ".$this->block_size($this->{source}."/".$loader);
$para.= " -b $loader";
@@ -325,6 +329,7 @@
my $boot = $base{$arch}{boot};
my $loader= $base{$arch}{efi};
$para.= " -eltorito-alt-boot";
+ $para.= " -eltorito-platform efi";
$para.= " -no-emul-boot";
$para.= " -boot-load-size ".$this->block_size($this->{source}."/".$loader);
$para.= " -b $loader";
@@ -417,6 +422,12 @@
return $this;
}
+sub ppc64le_default {
+ my $this = shift;
+ my $arch = shift;
+ $this->ppc64_default($arch);
+}
+
#==========================================
# aarch64_efi
#------------------------------------------
@@ -487,6 +498,7 @@
#------------------------------------------
if (($firmware ne 'bios') && (-e "$src/boot/$arch/efi")) {
$para.= ' -eltorito-alt-boot ';
+ $para.= " -eltorito-platform efi";
$para.= " -b boot/$arch/efi";
}
$para.= ' -no-emul-boot -joliet-long -hide glump -hide-joliet glump';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.0.5/rpm/product-builder.spec
new/product-builder-1.0.7/rpm/product-builder.spec
--- old/product-builder-1.0.5/rpm/product-builder.spec 2018-03-02
09:28:45.000000000 +0100
+++ new/product-builder-1.0.7/rpm/product-builder.spec 2018-03-13
06:41:14.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package product-builder
#
-# Copyright (c) 2017 SUSE LINUX Products 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
@@ -11,24 +11,27 @@
# case the license is the MIT License). An "Open Source License" is a
# 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://github.com/openSUSE/product-builder/issues
-#
-#
+
+
Summary: SUSE Product Builder
+License: GPL-2.0-only
+Group: System/Management
Url: http://github.com/openSUSE/product-builder
Name: product-builder
-License: GPL-2.0
-Group: System/Management
-Version: 1.01.01
-Provides: kiwi-schema = 6.2
+Conflicts: kiwi
+Conflicts: kiwi-instsource
+Version: 1.0.7
Release: 0
+Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
+# temporary hack for openSUSE:Factory only
+Patch1: accept_old_meta_package.patch
-Requires: perl >= %{perl_version}
Requires: libxslt
+Requires: perl >= %{perl_version}
Requires: perl-Class-Singleton
Requires: perl-Config-IniFiles >= 2.49
Requires: perl-File-Slurp
@@ -40,11 +43,12 @@
Requires: perl-libwww-perl
Provides: kiwi-packagemanager:instsource
+Provides: system-packages:kiwi-product
Requires: build
+Requires: checkmedia
Requires: inst-source-utils
-Requires: product-builder-plugin
Requires: mkisofs
-Requires: checkmedia
+Requires: product-builder-plugin
%ifarch %ix86 x86_64
Requires: syslinux
%endif
@@ -53,29 +57,33 @@
The SUSE product builder, builds product media (CD/DVD) for
the SUSE product portfolio. Based on kiwi perl implementation.
-To be used only for product medias after openSUSE 13.2, Leap 42
-and SLE 12.
+To be used only for product medias for Leap 15 and SLE 15.
%prep
%setup -q
+%if 0%{?skelcd_compat}
+%patch1 -p1
+%endif
%build
test -e /.buildenv && . /.buildenv
-make buildroot=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS"
+make buildroot="%{buildroot}" CFLAGS="%{optflags}"
%install
-make buildroot=$RPM_BUILD_ROOT \
- doc_prefix=$RPM_BUILD_ROOT/%{_defaultdocdir} \
- man_prefix=$RPM_BUILD_ROOT/%{_mandir} \
+make buildroot="%{buildroot}" \
+ doc_prefix="%{buildroot}/%{_defaultdocdir}" \
+ man_prefix="%{buildroot}/%{_mandir}" \
install
-./.version > $RPM_BUILD_ROOT%{_datadir}/kiwi/.revision
+./.version >"%{buildroot}/%{_datadir}/kiwi/.revision"
%files
%defattr(-, root, root)
%dir %{_datadir}/kiwi
+%doc LICENSE
%{_datadir}/kiwi/.revision
+%{_datadir}/kiwi/metadata
%{_datadir}/kiwi/modules
%{_datadir}/kiwi/xsl
-%{_sbindir}/kiwi
+%{_bindir}/product-builder
%changelog
++++++ product-builder.obsinfo ++++++
--- /var/tmp/diff_new_pack.ijjvNv/_old 2018-03-20 21:53:50.303771213 +0100
+++ /var/tmp/diff_new_pack.ijjvNv/_new 2018-03-20 21:53:50.307771069 +0100
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.0.5
-mtime: 1519979325
-commit: 8ccb98e1d747fa2ef6581446db393f750db32a05
+version: 1.0.7
+mtime: 1520919674
+commit: 880d31562cae82fd860ed50087b5bb1f07d692f0
