diff --git a/378a433bb2f92eddb95864abc94dc8cbf7cb19bb.patch b/378a433bb2f92eddb95864abc94dc8cbf7cb19bb.patch new file mode 100644 index 0000000000000000000000000000000000000000..ea7fac16c0e7b59ed4bfd4c371ef81f42c61606b --- /dev/null +++ b/378a433bb2f92eddb95864abc94dc8cbf7cb19bb.patch @@ -0,0 +1,37 @@ +diff --git a/.gitignore b/.gitignore +index 935255687d..dc8ca2c3f3 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,5 +1,5 @@ + # completion +-completion/kiwi-ng.sh ++completion/kiwi-ng + + # Schema formats + kiwi/schema/kiwi.xsd +diff --git a/Makefile b/Makefile +index cced7315a2..dda569fbfb 100644 +--- a/Makefile ++++ b/Makefile +@@ -47,7 +47,7 @@ install: + # completion + install -d -m 755 ${buildroot}usr/share/bash-completion/completions + $(python) helper/completion_generator.py \ +- > ${buildroot}usr/share/bash-completion/completions/kiwi-ng.sh ++ > ${buildroot}usr/share/bash-completion/completions/kiwi-ng + # kiwi default configuration + install -d -m 755 ${buildroot}etc + install -m 644 kiwi.yml ${buildroot}etc/kiwi.yml +diff --git a/package/python-kiwi-spec-template b/package/python-kiwi-spec-template +index 15e00620f8..c7d853c177 100644 +--- a/package/python-kiwi-spec-template ++++ b/package/python-kiwi-spec-template +@@ -434,7 +434,7 @@ fi + %{_bindir}/kiwi-ng-3* + %{_bindir}/kiwicompat-3* + %{python3_sitelib}/kiwi* +-%{_usr}/share/bash-completion/completions/kiwi-ng.sh ++%{_usr}/share/bash-completion/completions/kiwi-ng + %{_defaultdocdir}/python-kiwi/LICENSE + %{_defaultdocdir}/python-kiwi/README + diff --git a/kiwi.spec b/kiwi.spec index e59772ea8362d71e3616a30ce27bb204a27f4290..79eedb04dba66c3f543fc7f50e060e6c330bcd09 100644 --- a/kiwi.spec +++ b/kiwi.spec @@ -2,12 +2,13 @@ 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: 378a433bb2f92eddb95864abc94dc8cbf7cb19bb.patch BuildRequires: bash-completion dracut fdupes gcc make BuildRequires: python3-devel python3-setuptools shadow-utils @@ -189,6 +190,9 @@ done %{_mandir}/man8/%{name}* %changelog +* 20201104193007660436 patch-tracking 9.21.5-2 +- append patch file of upstream repository from <378a433bb2f92eddb95864abc94dc8cbf7cb19bb> to <378a433bb2f92eddb95864abc94dc8cbf7cb19bb> + * Tue Jul 28 2020 xinghe - 9.21.5-1 - update version to 9.21.5 @@ -208,4 +212,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