From 40d663979fbb7c1cde30e33e741c6f72414e63db8bab7004dc6fe6e78f8893a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <marcus.schaefer@gmail.com>
Date: Sun, 10 Mar 2024 17:01:40 +0000
Subject: [PATCH] =?UTF-8?q?-=20Bump=20version:=2010.0.3=20=E2=86=92=2010.0?=
 =?UTF-8?q?.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Delete invalid EPEL repo from rawhide tests

- Fix s390 tools and grub requirement
  On Fedora/RHEL this is named s390utils and there is no grub2

- Added rawhide integration test

- Add support for BLS zipl
  Add support for <bootloader name="zipl" .../> to support BLS
  based zipl configuration. This Fixes #2481

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=239
---
 PKGBUILD            |  4 ++--
 python-kiwi.changes | 30 ++++++++++++++++++++++++++++++
 python-kiwi.spec    | 16 ++++++++++++----
 python-kiwi.tar.gz  |  4 ++--
 4 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 3b9e9c8..93139fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay')
 arch=(x86_64)
-pkgver=10.0.3
+pkgver=10.0.4
 pkgrel=0
 pkgdesc="KIWI - Appliance Builder Next Generation"
 url="https://github.com/SUSE/kiwi/tarball/master"
@@ -12,7 +12,7 @@ makedepends=(make gcc python-build python-docopt python-installer python-lxml py
 provides=(kiwi-ng kiwi)
 source=("${pkgname}.tar.gz")
 changelog="${pkgname}.changes"
-md5sums=('a50c9641b13165189b36c0a91c4f7af6')
+md5sums=('176ae8ba6f6730071ad46f323b476f4f')
 
 
 build() {
diff --git a/python-kiwi.changes b/python-kiwi.changes
index 93f8fc5..fc2f186 100644
--- a/python-kiwi.changes
+++ b/python-kiwi.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sun Mar 10 17:55:32 CET 2024 - Marcus Schäfer <marcus.schaefer@gmail.com>
+
+- Bump version: 10.0.3 → 10.0.4
+
+-------------------------------------------------------------------
+Sat Mar 09 14:52:13 CET 2024 - Marcus Schäfer <marcus.schaefer@gmail.com>
+
+- Delete invalid EPEL repo from rawhide tests
+
+-------------------------------------------------------------------
+Fri Mar 08 16:31:12 CET 2024 - Marcus Schäfer <marcus.schaefer@gmail.com>
+
+- Fix s390 tools and grub requirement
+
+  On Fedora/RHEL this is named s390utils and there is no grub2
+
+-------------------------------------------------------------------
+Fri Mar 08 16:16:03 CET 2024 - Marcus Schäfer <marcus.schaefer@gmail.com>
+
+- Added rawhide integration test
+
 -------------------------------------------------------------------
 Thu Mar 07 15:51:11 CET 2024 - Marcus Schäfer <marcus.schaefer@gmail.com>
 
@@ -170,6 +192,14 @@ Tue Mar 05 21:09:46 CET 2024 - Marcus Schäfer <marcus.schaefer@gmail.com>
 
   CentOS-8 is EOL and dropped from upstream kiwi
 
+-------------------------------------------------------------------
+Mon Mar 04 11:36:33 CET 2024 - Marcus Schäfer <marcus.schaefer@gmail.com>
+
+- Add support for BLS zipl
+
+  Add support for <bootloader name="zipl" .../> to support BLS
+  based zipl configuration. This Fixes #2481
+
 -------------------------------------------------------------------
 Fri Mar 01 12:08:25 CET 2024 - Dmitri Popov <dpopov@suse.com>
 
diff --git a/python-kiwi.spec b/python-kiwi.spec
index 35acaca..2ce8a4e 100644
--- a/python-kiwi.spec
+++ b/python-kiwi.spec
@@ -44,7 +44,7 @@
 %endif
 
 Name:           python-kiwi
-Version:        10.0.3
+Version:        10.0.4
 Provides:       kiwi-schema = 7.5
 Release:        0
 Url:            https://github.com/OSInside/kiwi
@@ -232,9 +232,6 @@ Recommends:     gfxboot
 Requires:       grub2-efi-x64
 %endif
 %endif
-%if ! (0%{?debian} || 0%{?ubuntu})
-Requires:       grub2
-%endif
 %ifarch %arm aarch64
 %if 0%{?fedora} || 0%{?rhel}
 Requires:       uboot-tools
@@ -244,7 +241,14 @@ Requires:       u-boot-tools
 %endif
 %endif
 %ifarch s390 s390x
+%if 0%{?fedora} || 0%{?rhel}
+Requires:       s390utils
+%else
 Requires:       s390-tools
+%if ! (0%{?debian} || 0%{?ubuntu})
+Requires:       grub2
+%endif
+%endif
 %endif
 Requires:       kiwi-systemdeps-core = %{version}-%{release}
 
@@ -486,7 +490,11 @@ Requires:       xz
 Requires:       device-mapper
 %endif
 %ifarch s390 s390x
+%if 0%{?fedora} || 0%{?rhel}
+Requires:       s390utils
+%else
 Requires:       s390-tools
+%endif
 Requires:       parted
 %endif
 License:        GPL-3.0-or-later
diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz
index db1a973..e24c60b 100644
--- a/python-kiwi.tar.gz
+++ b/python-kiwi.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69ce78efb2c4be172ceea029769903449bff0f164b6f51601d3b217e5e09dc52
-size 1001526
+oid sha256:2677464033c0cd3b9df10a40c9c15d1e50a3f37bd68630d99fd30df5aeba5952
+size 1005444