From 2078dfa4f54940a99a0b4610e516b8049d1d463e4786d3aa4d2c0f45a9db9a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 8 Mar 2018 08:49:23 +0000 Subject: [PATCH 1/6] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=67 --- _service | 5 +++-- product-builder-1.0.5.obscpio | 3 --- product-builder-1.0.6.obscpio | 3 +++ product-builder.changes | 7 +++++++ product-builder.obsinfo | 6 +++--- product-builder.spec | 6 +++--- 6 files changed, 19 insertions(+), 11 deletions(-) delete mode 100644 product-builder-1.0.5.obscpio create mode 100644 product-builder-1.0.6.obscpio diff --git a/_service b/_service index b74dba8..dbd1210 100644 --- a/_service +++ b/_service @@ -1,9 +1,10 @@ https://github.com/openSUSE/product-builder.git - 1.0.5 - 1.0.5 + 1.0.6 + 1.0.6 git + rpm/product-builder.spec diff --git a/product-builder-1.0.5.obscpio b/product-builder-1.0.5.obscpio deleted file mode 100644 index b302e74..0000000 --- a/product-builder-1.0.5.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c43103b4b0a26a73722265acd3cbda460c08f6f3eb9e2379b8b8dc9af1ff8842 -size 1308685 diff --git a/product-builder-1.0.6.obscpio b/product-builder-1.0.6.obscpio new file mode 100644 index 0000000..9355ae2 --- /dev/null +++ b/product-builder-1.0.6.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b36956f7c2cf7a6f22d4bdcfe56f94e26d1dfdf98d7a4173123fea8174d81ff +size 1309197 diff --git a/product-builder.changes b/product-builder.changes index c7fe245..08f05a7 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 8 08:48:41 UTC 2018 - adrian@suse.de + +- 1.0.6 + * fix dependencies to mkisofs +- using spec file from git now + ------------------------------------------------------------------- Fri Mar 2 08:31:12 UTC 2018 - adrian@suse.de diff --git a/product-builder.obsinfo b/product-builder.obsinfo index 02f6320..3771c30 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.0.5 -mtime: 1519979325 -commit: 8ccb98e1d747fa2ef6581446db393f750db32a05 +version: 1.0.6 +mtime: 1520498860 +commit: cfcca82f36e470ce1d15a13deeaaa46216ac1dc5 diff --git a/product-builder.spec b/product-builder.spec index 82dd408..afc6a84 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -23,7 +23,7 @@ Url: http://github.com/openSUSE/product-builder Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.0.5 +Version: 1.0.6 Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz @@ -46,8 +46,8 @@ Provides: kiwi-packagemanager:instsource 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 @@ To be used only for product medias for Leap 15 and SLE 15. %prep %setup -q -%if 0%{?suse_version} == 1330 || 0%{?skelcd_compat} +%if 0%{?skelcd_compat} %patch1 -p1 %endif From f956a150cfd4d195f44af533f59bd949c59239c750e51a8315b7794ecab89bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 8 Mar 2018 08:52:40 +0000 Subject: [PATCH 2/6] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=68 --- product-builder.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/product-builder.changes b/product-builder.changes index 08f05a7..1c5cced 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -2,7 +2,8 @@ Thu Mar 8 08:48:41 UTC 2018 - adrian@suse.de - 1.0.6 - * fix dependencies to mkisofs + * fixed platform ID for EFI boot +- fix dependencies to mkisofs - using spec file from git now ------------------------------------------------------------------- From 988f1314002ef509af5b184c61ef9de4d7d06e72dff4693edb36ef5878aa1e83 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 13 Mar 2018 05:35:09 +0000 Subject: [PATCH 3/6] - fix ppc64le (related to bsc#1084893) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=69 --- product-builder-1.0.6.obscpio | 4 ++-- product-builder.changes | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/product-builder-1.0.6.obscpio b/product-builder-1.0.6.obscpio index 9355ae2..837984f 100644 --- a/product-builder-1.0.6.obscpio +++ b/product-builder-1.0.6.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b36956f7c2cf7a6f22d4bdcfe56f94e26d1dfdf98d7a4173123fea8174d81ff -size 1309197 +oid sha256:9421dc8af8bad222904fec1577ed926c84d2b139e94009ee92cbc086b4d5da8f +size 1309196 diff --git a/product-builder.changes b/product-builder.changes index 1c5cced..15df9c7 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -5,6 +5,7 @@ Thu Mar 8 08:48:41 UTC 2018 - adrian@suse.de * fixed platform ID for EFI boot - fix dependencies to mkisofs - using spec file from git now +- fix ppc64le (related to bsc#1084893) ------------------------------------------------------------------- Fri Mar 2 08:31:12 UTC 2018 - adrian@suse.de From 2f402e037d2a5812cbbba745d4b8880d4d8d13b0d1f59c7bdbf932cb13a9e0f2 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 13 Mar 2018 05:37:42 +0000 Subject: [PATCH 4/6] * fixed platform ID for EFI boot (bsc#1081739) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=70 --- product-builder.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product-builder.changes b/product-builder.changes index 15df9c7..3a051fb 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -2,7 +2,7 @@ Thu Mar 8 08:48:41 UTC 2018 - adrian@suse.de - 1.0.6 - * fixed platform ID for EFI boot + * fixed platform ID for EFI boot (bsc#1081739) - fix dependencies to mkisofs - using spec file from git now - fix ppc64le (related to bsc#1084893) From e005b9551da1c65363cfdde7e1a4804078ed2120fb734201b06543b98ab29b5a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 13 Mar 2018 05:45:39 +0000 Subject: [PATCH 5/6] - 1.0.7 * fix ppc64le (related to bsc#1084893) - align with SLE changes file OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=71 --- _service | 4 ++-- product-builder-1.0.6.obscpio | 3 --- product-builder-1.0.7.obscpio | 3 +++ product-builder.changes | 8 +++++++- product-builder.obsinfo | 6 +++--- product-builder.spec | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 product-builder-1.0.6.obscpio create mode 100644 product-builder-1.0.7.obscpio diff --git a/_service b/_service index dbd1210..078884c 100644 --- a/_service +++ b/_service @@ -1,8 +1,8 @@ https://github.com/openSUSE/product-builder.git - 1.0.6 - 1.0.6 + 1.0.7 + 1.0.7 git rpm/product-builder.spec diff --git a/product-builder-1.0.6.obscpio b/product-builder-1.0.6.obscpio deleted file mode 100644 index 837984f..0000000 --- a/product-builder-1.0.6.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9421dc8af8bad222904fec1577ed926c84d2b139e94009ee92cbc086b4d5da8f -size 1309196 diff --git a/product-builder-1.0.7.obscpio b/product-builder-1.0.7.obscpio new file mode 100644 index 0000000..bdb40d1 --- /dev/null +++ b/product-builder-1.0.7.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2de8c69acce4f58eb9d0fefe47712fef464e190ab421ee32f2a4cac28f32ded8 +size 1309196 diff --git a/product-builder.changes b/product-builder.changes index 3a051fb..5eff501 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 13 05:45:03 UTC 2018 - coolo@suse.com + +- 1.0.7 + * fix ppc64le (related to bsc#1084893) +- align with SLE changes file + ------------------------------------------------------------------- Thu Mar 8 08:48:41 UTC 2018 - adrian@suse.de @@ -5,7 +12,6 @@ Thu Mar 8 08:48:41 UTC 2018 - adrian@suse.de * fixed platform ID for EFI boot (bsc#1081739) - fix dependencies to mkisofs - using spec file from git now -- fix ppc64le (related to bsc#1084893) ------------------------------------------------------------------- Fri Mar 2 08:31:12 UTC 2018 - adrian@suse.de diff --git a/product-builder.obsinfo b/product-builder.obsinfo index 3771c30..24e08c9 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.0.6 -mtime: 1520498860 -commit: cfcca82f36e470ce1d15a13deeaaa46216ac1dc5 +version: 1.0.7 +mtime: 1520919674 +commit: 880d31562cae82fd860ed50087b5bb1f07d692f0 diff --git a/product-builder.spec b/product-builder.spec index afc6a84..8e1e9f0 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -23,7 +23,7 @@ Url: http://github.com/openSUSE/product-builder Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.0.6 +Version: 1.0.7 Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz From cd01cd0869315b67c6ef537d0fb6188e4b98d7704c565c4ef6df7c1b4d6b0d42 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 13 Mar 2018 06:56:21 +0000 Subject: [PATCH 6/6] - align with SLE changes file (add accept_old_meta_package.patch) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=72 --- product-builder.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product-builder.changes b/product-builder.changes index 5eff501..7fc5d7f 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -3,7 +3,7 @@ Tue Mar 13 05:45:03 UTC 2018 - coolo@suse.com - 1.0.7 * fix ppc64le (related to bsc#1084893) -- align with SLE changes file +- align with SLE changes file (add accept_old_meta_package.patch) ------------------------------------------------------------------- Thu Mar 8 08:48:41 UTC 2018 - adrian@suse.de