From 8e714d2d562e9c3f1571260a5a553a3c6709d9c8 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Wed, 25 Nov 2020 02:31:04 +0800
Subject: [PATCH 1/3] [patch tracking] 20201125023007659159 -
 https://github.com/OSInside/kiwi/commit/dbcd7144a1e0f8b9b140010474603ff405747488

---
 dbcd7144a1e0f8b9b140010474603ff405747488.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 dbcd7144a1e0f8b9b140010474603ff405747488.patch

diff --git a/dbcd7144a1e0f8b9b140010474603ff405747488.patch b/dbcd7144a1e0f8b9b140010474603ff405747488.patch
new file mode 100644
index 0000000..b6e5129
--- /dev/null
+++ b/dbcd7144a1e0f8b9b140010474603ff405747488.patch
@@ -0,0 +1,13 @@
+diff --git a/package/python-kiwi-spec-template b/package/python-kiwi-spec-template
+index 223c5b24fd..1fbc908398 100644
+--- a/package/python-kiwi-spec-template
++++ b/package/python-kiwi-spec-template
+@@ -136,7 +136,7 @@ Recommends:     gnupg2
+ Recommends:     dnf
+ Recommends:     gpg2
+ %endif
+-%if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
++%if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550
+ Provides:       kiwi-packagemanager:microdnf
+ Requires:       microdnf
+ %endif
-- 
Gitee


From 0a1c62da42e3de8e691f72db928f3a62ea87bb79 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Wed, 25 Nov 2020 02:31:04 +0800
Subject: [PATCH 2/3] [patch tracking] 20201125023007659159 -
 https://github.com/OSInside/kiwi/commit/c7fa2a4e0b0161527bc2ab6df38b2395aaec773f

---
 ...2a4e0b0161527bc2ab6df38b2395aaec773f.patch | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 c7fa2a4e0b0161527bc2ab6df38b2395aaec773f.patch

diff --git a/c7fa2a4e0b0161527bc2ab6df38b2395aaec773f.patch b/c7fa2a4e0b0161527bc2ab6df38b2395aaec773f.patch
new file mode 100644
index 0000000..4b2c3b4
--- /dev/null
+++ b/c7fa2a4e0b0161527bc2ab6df38b2395aaec773f.patch
@@ -0,0 +1,26 @@
+diff --git a/package/python-kiwi-spec-template b/package/python-kiwi-spec-template
+index 1fbc908398..be3d31f37e 100644
+--- a/package/python-kiwi-spec-template
++++ b/package/python-kiwi-spec-template
+@@ -124,9 +124,6 @@ Requires(postun): chkconfig
+ Requires:       qemu-img
+ Requires:       squashfs-tools
+ Requires:       gdisk
+-Requires:       dnf
+-Provides:       kiwi-packagemanager:dnf
+-Provides:       kiwi-packagemanager:yum
+ %if 0%{?fedora} || 0%{?rhel} >= 8
+ Recommends:     gnupg2
+ %endif
+@@ -140,6 +137,11 @@ Recommends:     gpg2
+ Provides:       kiwi-packagemanager:microdnf
+ Requires:       microdnf
+ %endif
++%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} >= 1550
++Requires:       dnf
++Provides:       kiwi-packagemanager:dnf
++Provides:       kiwi-packagemanager:yum
++%endif
+ %if 0%{?fedora} >= 26 || 0%{?suse_version}
+ Requires:       zypper
+ Provides:       kiwi-packagemanager:zypper
-- 
Gitee


From c736229286eaf1a84fa1f07118975cb80805d842 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Wed, 25 Nov 2020 02:31:05 +0800
Subject: [PATCH 3/3] [patch tracking] 20201125023007659159 - update spec file

---
 kiwi.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/kiwi.spec b/kiwi.spec
index e59772e..2145a1a 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -2,12 +2,14 @@
 
 Name:           kiwi
 Version:        9.21.5
-Release:        1
+Release:        2
 License:        GPLv3+
 Summary:        Flexible operating system image builder
 
 URL:            http://osinside.github.io/kiwi/
 Source0:        https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz
+Patch6000: dbcd7144a1e0f8b9b140010474603ff405747488.patch
+Patch6001: c7fa2a4e0b0161527bc2ab6df38b2395aaec773f.patch
 
 BuildRequires:  bash-completion dracut fdupes gcc make
 BuildRequires:  python3-devel python3-setuptools shadow-utils
@@ -189,6 +191,9 @@ done
 %{_mandir}/man8/%{name}*
 
 %changelog
+* 20201125023007659159 patch-tracking 9.21.5-2
+- append patch file of upstream repository from <dbcd7144a1e0f8b9b140010474603ff405747488> to <c7fa2a4e0b0161527bc2ab6df38b2395aaec773f>
+
 * Tue Jul 28 2020 xinghe <xinghe1@huawei.com> - 9.21.5-1
 - update version to 9.21.5
 
@@ -208,4 +213,4 @@ done
 - Remove python2 dependency
 
 * Sat Sep 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 9.16.12-2
-- Package init
+- Package init
\ No newline at end of file
-- 
Gitee