From 12748bcada2e5cb9960854316ae028651e7644f1 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Aug 26 2018 11:22:45 +0000
Subject: Upgrade to 9.16.12 (RH#1591056)


---

diff --git a/.gitignore b/.gitignore
index c33ab08..f69c3ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /kiwi-9.14.2.tar.gz
 /kiwi-9.15.1.tar.gz
 /kiwi-9.16.0.tar.gz
+/kiwi-9.16.12.tar.gz
diff --git a/0101-Use-the-versioned-Python-interpreter-path-to-run-bui.patch b/0101-Use-the-versioned-Python-interpreter-path-to-run-bui.patch
deleted file mode 100644
index 859d6d3..0000000
--- a/0101-Use-the-versioned-Python-interpreter-path-to-run-bui.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 233e6e2835a4b61961beeb06e3a604c89c614381 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <ngompa13@gmail.com>
-Date: Wed, 6 Jun 2018 08:28:14 -0400
-Subject: [PATCH] Use the versioned Python interpreter path to run build helper
- scripts
-
-The kiwi build process mostly does the right thing in terms of executing
-with the correct Python interpreter throughout the build process, with
-the exception of the Makefile not correctly locating the versioned Python
-interpreter executable path, and the bash completion generator being executed
-using '/usr/bin/python' without regard for what the target environment was.
-
-This is a problem when a build environment complying with PEP 394 as it
-stands today does not have Python 2 installed, such as when kiwi is being
-built as a Python 3-only package in Fedora. Thus, the Makefile has been
-adjusted to not only correctly locate the versioned Python interpreter, but
-to also execute 'completion_helper' with the correct interpreter.
-
-Additionally, a trivial change to the shebang to 'completion_helper'
-was made to be consistent with other Python-based build helper scripts.
-
-This is part of the overall effort to eliminate the dependencies on
-Python 2 in Fedora.
-
-Reference: https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
----
- Makefile                    | 4 ++--
- helper/completion_generator | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 85f00010..4cbea073 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- buildroot = /
- python_version = 3
--python_lookup_name = python
-+python_lookup_name = python$(python_version)
- python = $(shell which $(python_lookup_name))
- 
- LC = LC_MESSAGES
-@@ -43,7 +43,7 @@ install:
- 	done
- 	# completion
- 	install -d -m 755 ${buildroot}etc/bash_completion.d
--	helper/completion_generator \
-+	$(python) helper/completion_generator \
- 		> ${buildroot}etc/bash_completion.d/kiwi-ng-${python_version}.sh
- 	# license
- 	install -d -m 755 ${buildroot}/usr/share/doc/packages/python-kiwi
-diff --git a/helper/completion_generator b/helper/completion_generator
-index c56bc935..986fb2e9 100755
---- a/helper/completion_generator
-+++ b/helper/completion_generator
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- 
- from textwrap import dedent
- 
--- 
-2.17.1
-
diff --git a/kiwi.spec b/kiwi.spec
index 4e4219f..3467294 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -15,19 +15,14 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
 
 
 Name:           kiwi
-Version:        9.16.0
-Release:        3%{?dist}
+Version:        9.16.12
+Release:        1%{?dist}
 URL:            http://suse.github.io/kiwi/
 Summary:        Flexible operating system image builder
 License:        GPLv3+
 # We must use the version uploaded to pypi, as it contains all the required files.
 Source0:        https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz
 
-# Patches submitted upstream
-## Use versioned Python interpreter path for build helper scripts
-## From: https://github.com/SUSE/kiwi/pull/765
-Patch0101:      0101-Use-the-versioned-Python-interpreter-path-to-run-bui.patch
-
 # Fedora-specific patches
 ## Use python-pyxattr instead of python-xattr
 ## TODO: Get python-xattr into Fedora
@@ -206,7 +201,6 @@ geometry according to the setup in the kiwi image configuration
 %package -n dracut-kiwi-oem-dump
 Summary:        KIWI - Dracut module for oem(install) image type
 Requires:       dracut-kiwi-lib = %{version}-%{release}
-Requires:       dmraid
 Requires:       device-mapper-multipath
 Requires:       gawk
 Requires:       kexec-tools
@@ -364,6 +358,9 @@ done
 # Empty metapackage
 
 %changelog
+* Sun Aug 26 2018 Neal Gompa <ngompa13@gmail.com> - 9.16.12-1
+- Upgrade to 9.16.12 (RH#1591056)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 9.16.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 2186dbe..b3c949e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kiwi-9.16.0.tar.gz) = 712a79c71d7a9cdb4c409d6e2c3f0fabcf9140a3e38599ddf1bbf808f93d87ddafba3e7e38ce5cbf63eb16ef2490a5fd111fbebd15793dde5dcd010f515f2eb7
+SHA512 (kiwi-9.16.12.tar.gz) = 344a217c31861b754d7bbd0ae5390dde9ca1a592deaf3b3fe8c0275c8ee1bd58f1c83cd171e03004bad117d48a4c88b5aede89d5d5725713791b4bb5a26254af