Accepting request 614497 from openSUSE:Tools

- 1.1.3
  * Another fix needed for hybrid media on x86_64

- 1.1.2
  * Do not generate Apple partion on ppc64le anymore
  * Allow to build medias without meta packages again

- 1.1.1
  * fix EFI boot sort order
- drop factory skelcd hack (accept_old_meta_package.patch)

- 1.1.0
  * fixed handling of metapackages with multiple lines for one package
    filtered via required architecture
  * execute mk_listings when configured (bsc#1094929)
  + drop promo / live boot code
  * Add riscv64 architecture

OBS-URL: https://build.opensuse.org/request/show/614497
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/product-builder?expand=0&rev=23

_service

@@ -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.0.9</param>
+    <param name="revision">1.1.3</param>
-    <param name="version">1.0.9</param>
+    <param name="version">1.1.3</param>
     <param name="scm">git</param>
     <param name="extract">rpm/product-builder.spec</param>
   </service>

accept_old_meta_package.patch

@@ -1,12 +0,0 @@
-diff --git a/modules/KIWICollect.pm b/modules/KIWICollect.pm
-index b3e6357..f99ca8b 100644
---- a/modules/KIWICollect.pm
-+++ b/modules/KIWICollect.pm
-@@ -1535,6 +1535,7 @@ sub unpackMetapackages {
-                             and defined $this->{m_basesubdir}->{$_}
-                         ) {
-                             qx(cp -a $tmp/CD$_/* $this->{m_basesubdir}->{$_});
-+                            $packageFound = 1;
-                             $this->logMsg('W', "Unpack from old legacy /CD$_ directory");
-                         } elsif ($_ eq 1) {
-                             my $msg;

product-builder-1.0.9.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7f31b2b1430cda186d890d52d8eca39eb63710cb4448c5aeac2a8ff3b4d118c
-size 1310221

product-builder-1.1.3.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:207ef68109d8158e2e3599afe553ce4bd35f73a6dfa053d342d7585a78e9e59b
+size 1309197

product-builder.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Wed Jun  6 08:57:09 UTC 2018 - adrian@suse.de
+
+- 1.1.3
+  * Another fix needed for hybrid media on x86_64
+
+-------------------------------------------------------------------
+Tue Jun  5 12:46:51 UTC 2018 - adrian@suse.de
+
+- 1.1.2
+  * Do not generate Apple partion on ppc64le anymore
+  * Allow to build medias without meta packages again
+
+-------------------------------------------------------------------
+Mon Jun  4 13:35:16 UTC 2018 - adrian@suse.de
+
+- 1.1.1
+  * fix EFI boot sort order
+- drop factory skelcd hack (accept_old_meta_package.patch)
+
+-------------------------------------------------------------------
+Tue May 29 15:04:31 UTC 2018 - adrian@suse.de
+
+- 1.1.0
+  * fixed handling of metapackages with multiple lines for one package
+    filtered via required architecture
+  * execute mk_listings when configured (bsc#1094929)
+  + drop promo / live boot code
+  * Add riscv64 architecture
+
 -------------------------------------------------------------------
 Tue Apr 24 16:22:46 UTC 2018 - adrian@suse.de
 

product-builder.obsinfo

@@ -1,5 +1,5 @@
 name: product-builder
-version: 1.0.9
+version: 1.1.3
-mtime: 1524586880
+mtime: 1528275159
-commit: ac313bf62d317dba12acbd1f8446242924dca473
+commit: 717e1875568f05082a116dc015563f7bde4ec255
 

product-builder.spec

@@ -23,12 +23,10 @@ Url:            http://github.com/openSUSE/product-builder
 Name:           product-builder
 Conflicts:      kiwi
 Conflicts:      kiwi-instsource
-Version:        1.0.9
+Version:        1.1.3
 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:       libxslt
 Requires:       perl >= %{perl_version}
@@ -61,9 +59,6 @@ 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
@@ -77,9 +72,8 @@ make buildroot="%{buildroot}" \
 ./.version >"%{buildroot}/%{_datadir}/kiwi/.revision"
 
 %files
-%defattr(-, root, root)
 %dir %{_datadir}/kiwi
-%doc LICENSE
+%license LICENSE
 %{_datadir}/kiwi/.revision
 %{_datadir}/kiwi/metadata
 %{_datadir}/kiwi/modules