From f5f00372c09fa033f0981dfebd54479342ad9126 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 2 Jul 2014 19:26:32 +0100
Subject: [PATCH] New upstream version 1.1.5.

- Adds --accel option to select qemu acceleration mode.
- Remove upstream patch.
---
 ...-for-debug-etc.-kernels-RHBZ-1002189.patch | 31 -------------------
 qemu-sanity-check.spec                        | 13 ++++----
 sources                                       |  2 +-
 3 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 0001-Better-search-for-debug-etc.-kernels-RHBZ-1002189.patch

diff --git a/0001-Better-search-for-debug-etc.-kernels-RHBZ-1002189.patch b/0001-Better-search-for-debug-etc.-kernels-RHBZ-1002189.patch
deleted file mode 100644
index b0c036c..0000000
--- a/0001-Better-search-for-debug-etc.-kernels-RHBZ-1002189.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 50675ac8547c6865fe9476f07783a3bd21666aac Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Wed, 28 Aug 2013 17:00:29 +0100
-Subject: [PATCH] Better search for debug etc. kernels (RHBZ#1002189).
-
-This code now matches the same code in the original febootstrap
-(pre-rewrite in C) shell script.  Except that we don't look for kernel
-names that don't contain $arch, since that would only apply on really
-ancient RHEL.
-
-This updates commit e15822c82b3888420187eb32db82554266a6f350.
----
- qemu-sanity-check.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qemu-sanity-check.in b/qemu-sanity-check.in
-index dc99786..848c62f 100644
---- a/qemu-sanity-check.in
-+++ b/qemu-sanity-check.in
-@@ -99,7 +99,7 @@ fi
- 
- # Locate kernel if not specified.
- if [ -z "$kernel" ]; then
--    kernel="$(ls -vr /boot/vmlinuz-*.$arch{,+debug} 2>/dev/null | head -1)"
-+    kernel="$(ls -1dvr /boot/vmlinuz-*.$arch* 2>/dev/null | grep -v xen | head -1)"
-     if [ -z "$kernel" ]; then
-         echo "$0: cannot find a Linux kernel in /boot"
-         echo "Choose a kernel to test using --kernel=/path/to/vmlinuz"
--- 
-1.8.3.1
-
diff --git a/qemu-sanity-check.spec b/qemu-sanity-check.spec
index 1db94c9..7193be5 100644
--- a/qemu-sanity-check.spec
+++ b/qemu-sanity-check.spec
@@ -1,17 +1,14 @@
 %global debug_package %{nil}
 
 Name:            qemu-sanity-check
-Version:         1.1.4
-Release:         3%{?dist}
+Version:         1.1.5
+Release:         1%{?dist}
 Summary:         Simple qemu and Linux kernel sanity checker
 License:         GPLv2+
 
 URL:             http://people.redhat.com/~rjones/qemu-sanity-check
 Source0:         http://people.redhat.com/~rjones/qemu-sanity-check/files/%{name}-%{version}.tar.gz
 
-# Upstream patch included in >= 1.1.5.
-Patch1:          0001-Better-search-for-debug-etc.-kernels-RHBZ-1002189.patch
-
 # Non-upstream patch to disable test which fails on broken kernels
 # which don't respond to panic=1 option properly.
 Patch4:          0004-Disable-bad-userspace-test-Fedora-only.patch
@@ -73,7 +70,6 @@ as %{name} except that this package does not depend on qemu or kernel.
 %prep
 %setup -q
 
-%patch1 -p1
 %patch4 -p1
 
 # Rerun autotools because the patches touch configure.ac and Makefile.am.
@@ -112,6 +108,11 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %changelog
+* Wed Jul 02 2014 Richard W.M. Jones <rjones@redhat.com> - 1.1.5-1
+- New upstream version 1.1.5.
+- Adds --accel option to select qemu acceleration mode.
+- Remove upstream patch.
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index b9f5113..1fab55d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5fb1842dfbbe2ce1841a76e96d8cb93f  qemu-sanity-check-1.1.4.tar.gz
+cceb7bb200adee4136e25b77e3c12cb0  qemu-sanity-check-1.1.5.tar.gz