From 742b24eb23cfa665c7c2bca0c4ce6131bb5e2166 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Mon, 13 Sep 2010 15:26:25 +0200
Subject: [PATCH] Upstream release libvirt-0.8.4

---
 .gitignore                    |  1 +
 libvirt-0.8.3-boot-menu.patch | 12 ------------
 libvirt.spec                  | 16 ++++++----------
 sources                       |  2 +-
 4 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 libvirt-0.8.3-boot-menu.patch

diff --git a/.gitignore b/.gitignore
index 55e6af8..9d58ead 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 i686
 x86_64
 libvirt-*.tar.gz
+/libvirt-0.8.4.tar.gz
diff --git a/libvirt-0.8.3-boot-menu.patch b/libvirt-0.8.3-boot-menu.patch
deleted file mode 100644
index 289efd6..0000000
--- a/libvirt-0.8.3-boot-menu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup libvirt-0.8.3.orig/src/qemu/qemu_conf.c libvirt-0.8.3.new/src/qemu/qemu_conf.c
---- libvirt-0.8.3.orig/src/qemu/qemu_conf.c	2010-08-04 13:21:27.000000000 +0100
-+++ libvirt-0.8.3.new/src/qemu/qemu_conf.c	2010-08-23 21:08:13.239794362 +0100
-@@ -3651,7 +3651,7 @@ int qemudBuildCommandLine(virConnectPtr 
- {
-     int i;
-     char memory[50];
--    char boot[VIR_DOMAIN_BOOT_LAST];
-+    char boot[VIR_DOMAIN_BOOT_LAST+1];
-     struct utsname ut;
-     int disableKQEMU = 0;
-     int disableKVM = 0;
diff --git a/libvirt.spec b/libvirt.spec
index 3c13ea2..9911cc6 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -64,6 +64,7 @@
 %define with_nwfilter      0%{!?_without_nwfilter:0}
 %define with_libpcap       0%{!?_without_libpcap:0}
 %define with_macvtap       0%{!?_without_macvtap:0}
+%define with_libnl         0%{!?_without_libnl:0}
 
 # Non-server/HV driver defaults which are always enabled
 %define with_python        0%{!?_without_python:1}
@@ -159,8 +160,6 @@
 
 %if %{with_macvtap}
 %define with_libnl 1
-%else
-%define with_libnl 0
 %endif
 
 # Force QEMU to run as non-root
@@ -184,12 +183,11 @@
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.8.3
-Release: 2%{?dist}%{?extra_release}
+Version: 0.8.4
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
-Patch1: %{name}-%{version}-boot-menu.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -425,7 +423,6 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %if ! %{with_xen}
@@ -649,10 +646,6 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml
 %endif
 
-%if %{with_libvirtd}
-chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd
-%endif
-
 %clean
 rm -fr %{buildroot}
 
@@ -916,6 +909,9 @@ fi
 %endif
 
 %changelog
+* Mon Sep 13 2010 Daniel Veillard <veillard@redhat.com> - 0.8.4-1
+- Upstream release 0.8.4
+
 * Mon Aug 23 2010 Daniel P. Berrange <berrange@redhat.com> - 0.8.3-2
 - Fix potential overflow in boot menu code
 
diff --git a/sources b/sources
index e854bab..3f5a161 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae8535ce119d32a2e9fb1f46e2c8f325  libvirt-0.8.3.tar.gz
+a9300a068a07bcd72f86e4967d7f4d69  libvirt-0.8.4.tar.gz