From ae6bbcfcef18192c74a19cf48c4244824397c4ca55b4e86837bfe787e6388ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Fri, 6 Feb 2015 15:27:36 +0000
Subject: [PATCH] Accepting request 284504 from
 home:cbosdonnat:branches:Virtualization

Merging with hostfix patch

OBS-URL: https://build.opensuse.org/request/show/284504
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=332
---
 0000-hotfix.patch                     | 14 ++++++++++++++
 5f663c20-zypper-non-interactive.patch | 23 -----------------------
 libguestfs.changes                    |  2 +-
 libguestfs.spec                       |  3 ---
 4 files changed, 15 insertions(+), 27 deletions(-)
 delete mode 100644 5f663c20-zypper-non-interactive.patch

diff --git a/0000-hotfix.patch b/0000-hotfix.patch
index fe556db..2710ab6 100644
--- a/0000-hotfix.patch
+++ b/0000-hotfix.patch
@@ -28,3 +28,17 @@ index 7a4d43d..ceea593 100644
      ADD_ARG (argv, i, fs_buf);
      ADD_ARG (argv, i, NULL);
  
+Index: libguestfs-1.26.9/customize/customize_run.ml
+===================================================================
+--- libguestfs-1.26.9.orig/customize/customize_run.ml
++++ libguestfs-1.26.9/customize/customize_run.ml
+@@ -105,8 +105,7 @@ exec >>%s 2>&1
+     | "yum" ->
+       sprintf "yum -y install %s" quoted_args
+     | "zypper" ->
+-      (* XXX Should we use -n option? *)
+-      sprintf "zypper in %s" quoted_args
++      sprintf "zypper -n in %s" quoted_args
+     | "unknown" ->
+       eprintf (f_"%s: --install is not supported for this guest operating system\n")
+         prog;
diff --git a/5f663c20-zypper-non-interactive.patch b/5f663c20-zypper-non-interactive.patch
deleted file mode 100644
index 1676452..0000000
--- a/5f663c20-zypper-non-interactive.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 5f663c2082446f2b9722c3cb0fcac6c5778978e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
-Date: Tue, 3 Feb 2015 14:38:02 +0000
-Subject: [PATCH] customize: Invoke zypper correctly.
-
----
- customize/customize_run.ml | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-Index: libguestfs-1.26.9/customize/customize_run.ml
-===================================================================
---- libguestfs-1.26.9.orig/customize/customize_run.ml
-+++ libguestfs-1.26.9/customize/customize_run.ml
-@@ -105,8 +105,7 @@ exec >>%s 2>&1
-     | "yum" ->
-       sprintf "yum -y install %s" quoted_args
-     | "zypper" ->
--      (* XXX Should we use -n option? *)
--      sprintf "zypper in %s" quoted_args
-+      sprintf "zypper -n in %s" quoted_args
-     | "unknown" ->
-       eprintf (f_"%s: --install is not supported for this guest operating system\n")
-         prog;
diff --git a/libguestfs.changes b/libguestfs.changes
index 587cf38..69115a0 100644
--- a/libguestfs.changes
+++ b/libguestfs.changes
@@ -2,7 +2,7 @@
 Fri Feb  6 13:45:22 UTC 2015 - cbosdonnat@suse.com
 
 - Make zypper called with -n parameter when installing packages.
-  5f663c20-zypper-non-interactive.patch (bsc#916567)
+  (bsc#916567)
 
 -------------------------------------------------------------------
 Tue Dec  9 15:44:39 UTC 2014 - ohering@suse.de
diff --git a/libguestfs.spec b/libguestfs.spec
index 150de27..4cc375f 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -176,8 +176,6 @@ Summary:        Compatibility package for guestfs-tools
 License:        GPL-2.0
 Group:          System/Filesystems
 Patch0:         0000-hotfix.patch
-# Upstream patch
-Patch1:         5f663c20-zypper-non-interactive.patch
 Patch1000:      1000-force-virtio_blk-in-old-guest-kernel.patch
 Source0:        %{name}-%{version}.tar.xz
 Source42:       libguestfs.mkinitrd.tar.bz2
@@ -514,7 +512,6 @@ virtual machines.
 : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
 %setup -q -a 789653 -a 42
 %patch0 -p1
-%patch1 -p1
 %patch1000 -p1
 
 %build