diff --git a/c7fa2a4e0b0161527bc2ab6df38b2395aaec773f.patch b/c7fa2a4e0b0161527bc2ab6df38b2395aaec773f.patch new file mode 100644 index 0000000000000000000000000000000000000000..4b2c3b4088acb8ed5dd9ee01d6eab7f269d698b9 --- /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 diff --git a/dbcd7144a1e0f8b9b140010474603ff405747488.patch b/dbcd7144a1e0f8b9b140010474603ff405747488.patch new file mode 100644 index 0000000000000000000000000000000000000000..b6e5129802f5f58462ee1f2bbed8c3a662af191d --- /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 diff --git a/kiwi.spec b/kiwi.spec index e59772ea8362d71e3616a30ce27bb204a27f4290..2145a1abac22d3eac5df14de1d10acba4bffe79e 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 to + * Tue Jul 28 2020 xinghe - 9.21.5-1 - update version to 9.21.5 @@ -208,4 +213,4 @@ done - Remove python2 dependency * Sat Sep 21 2019 openEuler Buildteam - 9.16.12-2 -- Package init +- Package init \ No newline at end of file