[qemu/f18] Added libiscsi-devel BuildRequires

[bonzini]

commit 9ca03fda94384726cfb1b3307aadeaaa79f245fd
Author: Paolo Bonzini <pbonzini at redhat.com>
Date:   Mon Mar 11 17:25:17 2013 +0100

    Added libiscsi-devel BuildRequires

 0712-iscsi-look-for-pkg-config-file-too.patch |   36 +++++++++++++++++++++++++
 qemu.spec                                     |   11 +++++++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/0712-iscsi-look-for-pkg-config-file-too.patch b/0712-iscsi-look-for-pkg-config-file-too.patch
new file mode 100644
index 0000000..8c60ee3
--- /dev/null
+++ b/0712-iscsi-look-for-pkg-config-file-too.patch
@@ -0,0 +1,36 @@
+From: Paolo Bonzini <pbonzini at redhat.com>
+Subject: [PATCH 3/6] iscsi: look for pkg-config file too
+Date: Tue,  5 Mar 2013 18:05:22 +0100
+
+Due to library conflicts, Fedora will have to put libiscsi in
+/usr/lib/iscsi.  Simplify configuration by using a pkg-config
+file.  The Fedora package will distribute one, and the patch
+to add it has been sent to upstream libiscsi as well.
+
+Cc: qemu-stable at nongnu.org
+Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
+---
+ configure | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 2f98c5a..a9a7c99 100755
+--- a/configure
++++ b/configure
+@@ -2803,7 +2803,13 @@ if test "$libiscsi" != "no" ; then
+ #include <iscsi/iscsi.h>
+ int main(void) { iscsi_unmap_sync(NULL,0,0,0,NULL,0); return 0; }
+ EOF
+-  if compile_prog "" "-liscsi" ; then
++  if $pkg_config --atleast-version=1.7.0 libiscsi --modversion >/dev/null 2>&1; then
++    libiscsi="yes"
++    libiscsi_cflags=$($pkg_config --cflags libiscsi 2>/dev/null)
++    libiscsi_libs=$($pkg_config --libs libiscsi 2>/dev/null)
++    CFLAGS="$CFLAGS $libiscsi_cflags"
++    LIBS="$LIBS $libiscsi_libs"
++  elif compile_prog "" "-liscsi" ; then
+     libiscsi="yes"
+     LIBS="$LIBS -liscsi"
+   else
+-- 
+1.8.1.2
diff --git a/qemu.spec b/qemu.spec
index 03f180d..eea2de1 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -109,7 +109,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 1.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -534,6 +534,8 @@ Patch0709: 0709-e1000-Discard-oversized-packets-based-on-SBP-LPE.patch
 # Fix segfault with zero length virtio-scsi disk (bz 847549)
 Patch0710: 0710-Revert-serial-fix-retry-logic.patch
 Patch0711: 0711-scsi-fix-segfault-with-0-byte-disk.patch
+# Adapt to libiscsi packaging in Fedora (included upstream)
+Patch0712: 0712-iscsi-look-for-pkg-config-file-too.patch
 
 
 BuildRequires: SDL-devel
@@ -547,6 +549,7 @@ BuildRequires: libaio-devel
 BuildRequires: rsync
 BuildRequires: pciutils-devel
 BuildRequires: pulseaudio-libs-devel
+BuildRequires: libiscsi-devel
 BuildRequires: ncurses-devel
 BuildRequires: libattr-devel
 BuildRequires: usbredir-devel >= 0.5.2
@@ -1353,6 +1356,8 @@ CAC emulation development files.
 # Fix segfault with zero length virtio-scsi disk (bz 847549)
 %patch0710 -p1
 %patch0711 -p1
+# Adapt to libiscsi packaging in Fedora (included upstream)
+%patch0712 -p1
 
 
 %build
@@ -1962,6 +1967,10 @@ getent passwd qemu >/dev/null || \
 %{_libdir}/pkgconfig/libcacard.pc
 
 %changelog
+* Mon Mar 11 2013 Paolo Bonzini <pbonzini at redhat.com> - 2:1.2.2-7
+- Added libiscsi-devel BuildRequires
+- Use pkg-config to search for libiscsi
+
 * Sat Feb 02 2013 Cole Robinson <crobinso at redhat.com> - 2:1.2.2-6
 - Fix boot hang if console is not connected (bz #894451)
 - Fix segfault with zero length virtio-scsi disk (bz #847549)