From 7f050c29505229611c14b332984dc7221d503db6 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Mar 31 2019 22:56:03 +0000
Subject: Upgrade to 9.17.34 (RH#1688338)


- Patch to use buildah by default instead of umoci for OCI image builds

---

diff --git a/.gitignore b/.gitignore
index c860387..6034939 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /kiwi-9.16.12.tar.gz
 /kiwi-9.17.19.tar.gz
 /kiwi-9.17.27.tar.gz
+/kiwi-9.17.34.tar.gz
diff --git a/kiwi-9.17.34-use-buildah.patch b/kiwi-9.17.34-use-buildah.patch
new file mode 100644
index 0000000..d871e72
--- /dev/null
+++ b/kiwi-9.17.34-use-buildah.patch
@@ -0,0 +1,12 @@
+diff -rup kiwi-9.17.34/kiwi/defaults.py kiwi-9.17.34-buildah/kiwi/defaults.py
+--- kiwi-9.17.34/kiwi/defaults.py	2019-03-28 10:47:11.000000000 -0400
++++ kiwi-9.17.34-buildah/kiwi/defaults.py	2019-03-29 07:45:06.795671925 -0400
+@@ -1203,7 +1203,7 @@ class Defaults(object):
+ 
+         :rtype: str
+         """
+-        return 'umoci'
++        return 'buildah'
+ 
+     @staticmethod
+     def get_default_container_tag():
diff --git a/kiwi.spec b/kiwi.spec
index 47ffb1c..69e768a 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -18,7 +18,7 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
 
 
 Name:           kiwi
-Version:        9.17.27
+Version:        9.17.34
 Release:        1%{?dist}
 URL:            http://suse.github.io/kiwi/
 Summary:        Flexible operating system image builder
@@ -30,6 +30,9 @@ Source0:        https://files.pythonhosted.org/packages/source/k/%{name}/%{name}
 ## Use python-pyxattr instead of python-xattr
 ## TODO: Get python-xattr into Fedora
 Patch1000:      kiwi-9.12.8-use-pyxattr.patch
+## Use buildah instead of umoci by default for OCI image builds
+## TODO: Consider getting umoci into Fedora?
+Patch1001:      kiwi-9.17.34-use-buildah.patch
 
 BuildRequires:  bash-completion
 BuildRequires:  dracut
@@ -75,6 +78,7 @@ Requires:       zypper
 Provides:       kiwi-packagemanager:zypper
 %endif
 # Common tool dependencies
+Requires:       buildah
 Requires:       device-mapper-multipath
 Requires:       dosfstools
 Requires:       e2fsprogs
@@ -355,6 +359,10 @@ done
 # Empty metapackage
 
 %changelog
+* Sun Mar 31 2019 Neal Gompa <ngompa13@gmail.com> - 9.17.34-1
+- Upgrade to 9.17.34 (RH#1688338)
+- Patch to use buildah by default instead of umoci for OCI image builds
+
 * Sun Mar 10 2019 Neal Gompa <ngompa13@gmail.com> - 9.17.27-1
 - Upgrade to 9.17.27 (RH#1680084)
 
diff --git a/sources b/sources
index ba20e7a..6b1422f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kiwi-9.17.27.tar.gz) = 3185516a2797dd90b95d52a7630f1fe63b33afd1549adc370712975927a1f9972a01381aa02870807264d98952ba08b1e64688b19d0e296dba7ffe6d08ba0273
+SHA512 (kiwi-9.17.34.tar.gz) = 09893e1e29683dc6d7d91557238a72f5c3e778eafabdee5159232ca6621f3be164f4f3ddfbc9f5f607c3170fa4b4213d306f7ba9073f726bf23f482f34457c66