diff -ruN libvirt-0.8.7-18.el6_1.1.src.rpm-rpmbuild/SOURCES/libvirt-Fix-devmapper-dependency.patch libvirt-0.8.7-18.el6.1.0.src.rpm-rpmbuild/SOURCES/libvirt-Fix-devmapper-dependency.patch
--- libvirt-0.8.7-18.el6_1.1.src.rpm-rpmbuild/SOURCES/libvirt-Fix-devmapper-dependency.patch	1970-01-01 01:00:00.000000000 +0100
+++ libvirt-0.8.7-18.el6.1.0.src.rpm-rpmbuild/SOURCES/libvirt-Fix-devmapper-dependency.patch	2011-10-27 16:01:49.000000000 +0100
@@ -0,0 +1,48 @@
+diff --git a/configure.ac b/configure.ac
+index 2bb6918..0f81484 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1697,25 +1697,22 @@ if test "$with_storage_mpath" = "check" && test "$with_linux" = "yes"; then
+ fi
+ AM_CONDITIONAL([WITH_STORAGE_MPATH], [test "$with_storage_mpath" = "yes"])
+ 
+-if test "$with_storage_mpath" = "yes"; then
+-   DEVMAPPER_CFLAGS=
+-   DEVMAPPER_LIBS=
+-   PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= $DEVMAPPER_REQUIRED], [], [DEVMAPPER_FOUND=no])
+-   if test "$DEVMAPPER_FOUND" = "no"; then
+-     # devmapper is missing pkg-config files in ubuntu, suse, etc
+-     save_LIBS="$LIBS"
+-     save_CFLAGS="$CFLAGS"
+-     DEVMAPPER_FOUND=yes
+-     AC_CHECK_HEADER([libdevmapper.h],,[DEVMAPPER_FOUND=no])
+-     AC_CHECK_LIB([devmapper], [dm_task_run],,[DEVMAPPER_FOUND=no])
+-     DEVMAPPER_LIBS="-ldevmapper"
+-     LIBS="$save_LIBS"
+-     CFLAGS="$save_CFLAGS"
+-   fi
+-   if test "$DEVMAPPER_FOUND" = "no" ; then
+-     AC_MSG_ERROR([You must install device-mapper-devel/libdevmapper >= $DEVMAPPER_REQUIRED to compile libvirt])
+-   fi
+-
++DEVMAPPER_CFLAGS=
++DEVMAPPER_LIBS=
++PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= $DEVMAPPER_REQUIRED], [], [DEVMAPPER_FOUND=no])
++if test "$DEVMAPPER_FOUND" = "no"; then
++  # devmapper is missing pkg-config files in ubuntu, suse, etc
++  save_LIBS="$LIBS"
++  save_CFLAGS="$CFLAGS"
++  DEVMAPPER_FOUND=yes
++  AC_CHECK_HEADER([libdevmapper.h],,[DEVMAPPER_FOUND=no])
++  AC_CHECK_LIB([devmapper], [dm_task_run],,[DEVMAPPER_FOUND=no])
++  DEVMAPPER_LIBS="-ldevmapper"
++  LIBS="$save_LIBS"
++  CFLAGS="$save_CFLAGS"
++fi
++if test "$DEVMAPPER_FOUND" = "no" ; then
++  AC_MSG_ERROR([You must install device-mapper-devel/libdevmapper >= $DEVMAPPER_REQUIRED to compile libvirt])
+ fi
+ AC_SUBST([DEVMAPPER_CFLAGS])
+ AC_SUBST([DEVMAPPER_LIBS])
+-- 
+1.7.1
diff -ruN libvirt-0.8.7-18.el6_1.1.src.rpm-rpmbuild/SOURCES/libvirt-rhbz732931.patch libvirt-0.8.7-18.el6.1.0.src.rpm-rpmbuild/SOURCES/libvirt-rhbz732931.patch
--- libvirt-0.8.7-18.el6_1.1.src.rpm-rpmbuild/SOURCES/libvirt-rhbz732931.patch	1970-01-01 01:00:00.000000000 +0100
+++ libvirt-0.8.7-18.el6.1.0.src.rpm-rpmbuild/SOURCES/libvirt-rhbz732931.patch	2011-12-16 00:24:51.000000000 +0000
@@ -0,0 +1,12 @@
+--- a/tests/commandtest.c.orig	2011-12-16 00:11:42.024750000 +0000
++++ b/tests/commandtest.c	2011-12-16 00:12:17.702326000 +0000
+@@ -729,6 +729,9 @@
+     if (chdir("/tmp") < 0)
+         return(EXIT_FAILURE);
+ 
++    setpgid(0, 0);
++    setsid();
++
+     /* Kill off any inherited fds that might interfere with our
+      * testing.  */
+     close(3);
diff -ruN libvirt-0.8.7-18.el6_1.1.src.rpm-rpmbuild/SPECS/libvirt.spec libvirt-0.8.7-18.el6.1.0.src.rpm-rpmbuild/SPECS/libvirt.spec
--- libvirt-0.8.7-18.el6_1.1.src.rpm-rpmbuild/SPECS/libvirt.spec	2011-08-08 10:20:44.000000000 +0100
+++ libvirt-0.8.7-18.el6.1.0.src.rpm-rpmbuild/SPECS/libvirt.spec	2011-12-16 00:03:04.000000000 +0000
@@ -14,6 +14,11 @@
 %endif
 %endif
 
+%ifarch %{arm}
+%define client_only        1
+BuildRequires: device-mapper-devel device-mapper-libs
+%endif
+
 # Disable all server side drivers if client only build requested
 %if %{client_only}
 %define server_drivers     0
@@ -204,7 +209,7 @@
 Summary: Library providing a simple virtualization API
 Name: libvirt
 Version: 0.8.7
-Release: 18%{?dist}%{?extra_release}.1
+Release: 18%{?dist}%{?extra_release}.1.0
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -442,6 +447,9 @@
 Patch230: libvirt-qemu-Translate-boot-config-into-bootindex-if-possible.patch
 Patch231: libvirt-remote-protect-against-integer-overflow.patch
 
+Patch10001: libvirt-Fix-devmapper-dependency.patch
+Patch10002: libvirt-rhbz732931.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -943,6 +951,9 @@
 %patch230 -p1
 %patch231 -p1
 
+%patch10001 -p1
+%patch10002 -p1
+
 chmod 0755 tests/virsh-optparse
 
 %build
@@ -1183,6 +1194,7 @@
 
 %if ! %{with_libvirtd}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}/html
 mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}/html \
    $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-devel-%{version}/
 %endif
@@ -1504,6 +1516,10 @@
 %endif
 
 %changelog
+* Thu Dec 15 2011 Gordan Bobic <gordan@bobich.net> - 0.8.7-18.el6_1.1.0
+- Make %{arm} architecture client-only since there are no hypervisors available.
+- Fix rhbz732931
+
 * Mon Aug  8 2011 Daniel Veillard <veillard@redhat.com> - libvirt-0.8.7-18.el6_1.1
 - debug: Avoid null dereference on uuid lookup api (rhbz#728546)
 - Fix auditing of disk hotunplug operations (rhbz#728516)