[libvirt] Update to 1.0.0 release

[Daniel P. Berrange]

commit 8cc50838dcabee9de7e6d1c5e20680388cbdfc7d
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Thu Nov 8 22:21:41 2012 +0100

    Update to 1.0.0 release

 ...emu-system-i386-as-binary-instead-of-qemu.patch |   27 -----------
 libvirt.spec                                       |   50 ++++++++++++++++----
 sources                                            |    2 +-
 3 files changed, 41 insertions(+), 38 deletions(-)
---
diff --git a/libvirt.spec b/libvirt.spec
index e419deb..15b7e81 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -108,6 +108,7 @@
 %define with_systemd       0%{!?_without_systemd:0}
 %define with_numad         0%{!?_without_numad:0}
 %define with_firewalld     0%{!?_without_firewalld:0}
+%define with_libssh2_transport 0%{!?_without_libssh2_transport:0}
 
 # Non-server/HV driver defaults which are always enabled
 %define with_python        0%{!?_without_python:1}
@@ -229,6 +230,11 @@
 %endif
 %endif
 
+# Enable libssh2 transport for new enough distros
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
+%define with_libssh2_transport 0%{!?_without_libssh2_transport:1}
+%endif
+
 # Disable some drivers when building without libvirt daemon.
 # The logic is the same as in configure.ac
 %if ! %{with_libvirtd}
@@ -319,8 +325,8 @@
 
 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 0.10.2.1
-Release: 2%{?dist}%{?extra_release}
+Version: 1.0.0
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -330,11 +336,6 @@ URL: http://libvirt.org/
 %define mainturl stable_updates/
 %endif
 Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
-# Fix qemu -> qemu-system-i386 (RHBZ#857026).
-# keep: This patch is Fedora-specific and not upstream.
-Patch1: 0001-Use-qemu-system-i386-as-binary-instead-of-qemu.patch
-
-
 
 %if %{with_libvirtd}
 Requires: libvirt-daemon = %{version}-%{release}
@@ -413,8 +414,14 @@ BuildRequires: libpciaccess-devel >= 0.10.9
 BuildRequires: yajl-devel
 %endif
 %if %{with_sanlock}
+# make sure libvirt is built with new enough sanlock on
+# distros that have it; required for on_lockfailure
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
+BuildRequires: sanlock-devel >= 2.4
+%else
 BuildRequires: sanlock-devel >= 1.8
 %endif
+%endif
 %if %{with_libpcap}
 BuildRequires: libpcap-devel
 %endif
@@ -500,9 +507,13 @@ BuildRequires: numactl-devel
 %if %{with_capng}
 BuildRequires: libcap-ng-devel >= 0.5.0
 %endif
-%if %{with_phyp}
+%if %{with_phyp} || %{with_libssh2_transport}
+%if %{with_libssh2_transport}
+BuildRequires: libssh2-devel >= 1.3.0
+%else
 BuildRequires: libssh2-devel
 %endif
+%endif
 
 %if %{with_netcf}
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
@@ -623,7 +634,7 @@ Requires: PolicyKit >= 0.6
 %if %{with_storage_fs}
 Requires: nfs-utils
 # For mkfs
-Requires: util-linux-ng
+Requires: util-linux
 # For pool-build probing for existing pools
 BuildRequires: libblkid-devel >= 2.17
 # For glusterfs
@@ -1006,6 +1017,9 @@ Requires: cyrus-sasl
 # work correctly & doesn't have onerous dependencies
 Requires: cyrus-sasl-md5
 %endif
+%if %{with_libssh2_transport}
+Requires: libssh2 >= 1.3.0
+%endif
 
 %description client
 Shared libraries and client binaries needed to access to the
@@ -1025,10 +1039,15 @@ Include header files & development libraries for the libvirt C library.
 %package lock-sanlock
 Summary: Sanlock lock manager plugin for QEMU driver
 Group: Development/Libraries
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
+Requires: sanlock >= 2.4
+%else
 Requires: sanlock >= 1.8
+%endif
 #for virt-sanlock-cleanup require augeas
 Requires: augeas
 Requires: %{name}-daemon = %{version}-%{release}
+Requires: %{name}-client = %{version}-%{release}
 
 %description lock-sanlock
 Includes the Sanlock lock manager plugin for the QEMU
@@ -1050,7 +1069,6 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %if ! %{with_xen}
@@ -1559,6 +1577,14 @@ fi
 /bin/systemctl try-restart libvirt-guests.service >/dev/null 2>&1 || :
 %endif
 
+%if %{with_sanlock}
+%post lock-sanlock
+if getent group sanlock > /dev/null ; then
+    chmod 0770 %{_localstatedir}/lib/libvirt/sanlock
+    chown root:sanlock %{_localstatedir}/lib/libvirt/sanlock
+fi
+%endif
+
 %files
 %defattr(-, root, root)
 
@@ -1812,6 +1838,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/sanlock
 %{_sbindir}/virt-sanlock-cleanup
 %{_mandir}/man8/virt-sanlock-cleanup.8*
+%attr(0755, root, root) %{_libexecdir}/libvirt_sanlock_helper
 %endif
 
 %files client -f %{name}.lang
@@ -1903,6 +1930,9 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
 %endif
 
 %changelog
+* Thu Nov  8 2012 Daniel P. Berrange <berrange at redhat.com> - 1.0.0-1
+- Update to 1.0.0 release
+
 * Tue Oct 30 2012 Cole Robinson <crobinso at redhat.com> - 0.10.2.1-2
 - Disable libxl on F18 too
 
diff --git a/sources b/sources
index 1543a73..3495f78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c090c8abc89653456e3342f9aa9f18fe  libvirt-0.10.2.1.tar.gz
+7c8b006de7338e30866bb56738803b21  libvirt-1.0.0.tar.gz