From ca719c29260eeebf78f97d30c0c9c1e2d09c210a35f9e63e8284798022305f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.com>
Date: Thu, 28 Aug 2014 17:12:25 +0000
Subject: [PATCH] Accepting request 246746 from
 home:a_faerber:branches:Virtualization

Backport of s390-ccw.img build fix (bnc#893535)

OBS-URL: https://build.opensuse.org/request/show/246746
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=228
---
 qemu.changes | 6 ++++++
 qemu.spec    | 3 +++
 qemu.spec.in | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/qemu.changes b/qemu.changes
index e19c66fb..50f9f62c 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug 28 12:53:19 UTC 2014 - afaerber@suse.de
+
+- Copy the freshly built s390-ccw.img over to the location
+  from which it is installed (bnc#893535)
+
 -------------------------------------------------------------------
 Fri Aug 22 10:37:00 UTC 2014 - agraf@suse.com
 
diff --git a/qemu.spec b/qemu.spec
index bcdf3dec..539d29c3 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -574,6 +574,9 @@ make -C roms seavgabios
 make -C roms pxerom
 make -C roms sgabios
 %endif
+%ifarch s390x
+cp pc-bios/s390-ccw/s390-ccw.img pc-bios/s390-ccw.img
+%endif
 
 %check
 make check V=1
diff --git a/qemu.spec.in b/qemu.spec.in
index cbf48a97..941115c9 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -496,6 +496,9 @@ make -C roms seavgabios
 make -C roms pxerom
 make -C roms sgabios
 %endif
+%ifarch s390x
+cp pc-bios/s390-ccw/s390-ccw.img pc-bios/s390-ccw.img
+%endif
 
 %check
 make check V=1