From 05409c73811a8b2388be249fed7e95860737f883 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Jun 12 2013 16:37:46 +0000
Subject: Fix build with rawhide libfdt


---

diff --git a/0007-Remove-libfdt_env-use-system-version.patch b/0007-Remove-libfdt_env-use-system-version.patch
new file mode 100644
index 0000000..b9d078b
--- /dev/null
+++ b/0007-Remove-libfdt_env-use-system-version.patch
@@ -0,0 +1,54 @@
+From f93b077671cbdabd16fc05bb33d9e49110fb0e63 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Wed, 12 Jun 2013 12:33:48 -0400
+Subject: [PATCH] Remove libfdt_env, use system version
+
+Seems to conflict with newer libfdt, see discussion here:
+https://bugzilla.redhat.com/show_bug.cgi?id=969955
+---
+ include/libfdt_env.h | 36 ------------------------------------
+ 1 file changed, 36 deletions(-)
+ delete mode 100644 include/libfdt_env.h
+
+diff --git a/include/libfdt_env.h b/include/libfdt_env.h
+deleted file mode 100644
+index 3667d4c..0000000
+--- a/include/libfdt_env.h
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/*
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License, version 2, as
+- * published by the Free Software Foundation.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+- *
+- * Copyright IBM Corp. 2008
+- * Authors: Hollis Blanchard <hollisb@us.ibm.com>
+- *
+- */
+-
+-#ifndef _LIBFDT_ENV_H
+-#define _LIBFDT_ENV_H
+-
+-#include "qemu/bswap.h"
+-
+-#ifdef HOST_WORDS_BIGENDIAN
+-#define fdt32_to_cpu(x)  (x)
+-#define cpu_to_fdt32(x)  (x)
+-#define fdt64_to_cpu(x)  (x)
+-#define cpu_to_fdt64(x)  (x)
+-#else
+-#define fdt32_to_cpu(x)  bswap32(x)
+-#define cpu_to_fdt32(x)  bswap32(x)
+-#define fdt64_to_cpu(x)  bswap64(x)
+-#define cpu_to_fdt64(x)  bswap64(x)
+-#endif
+-
+-#endif /* _LIBFDT_ENV_H */
diff --git a/qemu.spec b/qemu.spec
index 5287056..5941b7c 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -140,7 +140,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 1.5.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Development/Tools
@@ -190,6 +190,8 @@ Patch0004: 0004-pc_piix-Add-compat-handling-for-qemu-kvm-VGA-mem-siz.patch
 Patch0005: 0005-qxl-Add-rom_size-compat-property-fix-migration-from-.patch
 # Fix rtl8139 + windows 7 + large transfers (bz #970240)
 Patch0006: 0006-rtl8139-flush-queued-packets-when-RxBufPtr-is-writte.patch
+# Fix build with rawhide libfdt
+Patch0007: 0007-Remove-libfdt_env-use-system-version.patch
 
 BuildRequires: SDL-devel
 BuildRequires: zlib-devel
@@ -688,6 +690,8 @@ CAC emulation development files.
 %patch0005 -p1
 # Fix rtl8139 + windows 7 + large transfers (bz #970240)
 %patch0006 -p1
+# Fix build with rawhide libfdt
+%patch0007 -p1
 
 
 %build
@@ -1368,6 +1372,9 @@ getent passwd qemu >/dev/null || \
 %endif
 
 %changelog
+* Wed Jun 12 2013 Cole Robinson <crobinso@redhat.com> - 2:1.5.0-6
+- Fix build with rawhide libfdt
+
 * Tue Jun 11 2013 Cole Robinson <crobinso@redhat.com> - 2:1.5.0-5
 - Fix rtl8139 + windows 7 + large transfers (bz #970240)