diff --git a/534a3d6543826b99628bdf15b9ce515ca6622567.patch b/534a3d6543826b99628bdf15b9ce515ca6622567.patch new file mode 100644 index 0000000000000000000000000000000000000000..e76989a4e6a4e7a93fba57ce727fc82b25b78aeb --- /dev/null +++ b/534a3d6543826b99628bdf15b9ce515ca6622567.patch @@ -0,0 +1,35 @@ +diff --git a/.bumpversion.cfg b/.bumpversion.cfg +index 50ceac6daf..4b27951600 100644 +--- a/.bumpversion.cfg ++++ b/.bumpversion.cfg +@@ -1,5 +1,5 @@ + [bumpversion] +-current_version = 9.21.18 ++current_version = 9.21.19 + commit = True + tag = True + +diff --git a/doc/source/conf.py b/doc/source/conf.py +index fccab015de..edd33ca142 100644 +--- a/doc/source/conf.py ++++ b/doc/source/conf.py +@@ -128,7 +128,7 @@ def setup(app): + # built documents. + # + # The short X.Y version. +-version = '9.21.18' ++version = '9.21.19' + # The full version, including alpha/beta/rc tags. + release = version + +diff --git a/kiwi/version.py b/kiwi/version.py +index 8e937b4495..cdc37c1a59 100644 +--- a/kiwi/version.py ++++ b/kiwi/version.py +@@ -18,5 +18,5 @@ + """ + Global version information used in kiwi and the package + """ +-__version__ = '9.21.18' ++__version__ = '9.21.19' + __githash__ = '$Format:%H$' diff --git a/kiwi.spec b/kiwi.spec index e59772ea8362d71e3616a30ce27bb204a27f4290..a0759b88a3c5235a1aec4da9546e659262f0df06 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: 534a3d6543826b99628bdf15b9ce515ca6622567.patch BuildRequires: bash-completion dracut fdupes gcc make BuildRequires: python3-devel python3-setuptools shadow-utils @@ -189,6 +190,9 @@ done %{_mandir}/man8/%{name}* %changelog +* 20201021213007660143 patch-tracking 9.21.5-2 +- append patch file of upstream repository from <534a3d6543826b99628bdf15b9ce515ca6622567> to <534a3d6543826b99628bdf15b9ce515ca6622567> + * 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