Old patch didn't apply in kodji ??? Daniel

- Bring up the bridge, even if it doesn't have an IP address (bug #501912)

.cvsignore

@@ -4,3 +4,7 @@ i686
 x86_64
 libvirt-*.tar.gz
 libvirt-0.6.0.tar.gz
+libvirt-0.6.1.tar.gz
+libvirt-0.6.2.tar.gz
+libvirt-0.6.3.tar.gz
+libvirt-0.6.4.tar.gz

libvirt-0.6.0-autostart-timeout.patch

@@ -1,21 +0,0 @@
-diff -rup libvirt-0.6.0.orig/src/remote_internal.c libvirt-0.6.0.new/src/remote_internal.c
---- libvirt-0.6.0.orig/src/remote_internal.c	2009-02-18 10:56:34.000000000 +0000
-+++ libvirt-0.6.0.new/src/remote_internal.c	2009-02-18 13:35:26.000000000 +0000
-@@ -654,12 +654,13 @@ doRemoteOpen (virConnectPtr conn,
-              */
-             if (errno == ECONNREFUSED &&
-                 flags & VIR_DRV_OPEN_REMOTE_AUTOSTART &&
--                trials < 5) {
-+                trials < 20) {
-                 close(priv->sock);
-                 priv->sock = -1;
--                if (remoteForkDaemon(conn) == 0) {
-+                if (trials > 0 ||
-+                    remoteForkDaemon(conn) == 0) {
-                     trials++;
--                    usleep(5000 * trials * trials);
-+                    usleep(1000 * 100 * trials);
-                     goto autostart_retry;
-                 }
-             }
-Only in libvirt-0.6.0.new/src: remote_internal.c~

libvirt-0.6.0-dbus-threads.patch

@@ -1,44 +0,0 @@
-diff -rup libvirt-0.6.0.orig/qemud/qemud.c libvirt-0.6.0.new/qemud/qemud.c
---- libvirt-0.6.0.orig/qemud/qemud.c	2009-02-18 10:56:34.000000000 +0000
-+++ libvirt-0.6.0.new/qemud/qemud.c	2009-02-18 12:52:18.000000000 +0000
-@@ -860,6 +860,10 @@ static struct qemud_server *qemudNetwork
-     if (auth_unix_rw == REMOTE_AUTH_POLKIT ||
-         auth_unix_ro == REMOTE_AUTH_POLKIT) {
-         DBusError derr;
-+
-+        dbus_connection_set_change_sigpipe(FALSE);
-+        dbus_threads_init_default();
-+
-         dbus_error_init(&derr);
-         server->sysbus = dbus_bus_get(DBUS_BUS_SYSTEM, &derr);
-         if (!(server->sysbus)) {
-@@ -868,6 +872,7 @@ static struct qemud_server *qemudNetwork
-             dbus_error_free(&derr);
-             goto cleanup;
-         }
-+        dbus_connection_set_exit_on_disconnect(server->sysbus, FALSE);
-     }
- #endif
- 
-diff -rup libvirt-0.6.0.orig/src/node_device_hal.c libvirt-0.6.0.new/src/node_device_hal.c
---- libvirt-0.6.0.orig/src/node_device_hal.c	2009-01-16 12:44:22.000000000 +0000
-+++ libvirt-0.6.0.new/src/node_device_hal.c	2009-02-18 12:52:48.000000000 +0000
-@@ -685,6 +685,9 @@ static int halDeviceMonitorStartup(void)
-     nodeDeviceLock(driverState);
- 
-     /* Allocate and initialize a new HAL context */
-+    dbus_connection_set_change_sigpipe(FALSE);
-+    dbus_threads_init_default();
-+
-     dbus_error_init(&err);
-     hal_ctx = libhal_ctx_new();
-     if (hal_ctx == NULL) {
-@@ -696,6 +699,8 @@ static int halDeviceMonitorStartup(void)
-         fprintf(stderr, "%s: dbus_bus_get failed\n", __FUNCTION__);
-         goto failure;
-     }
-+    dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE);
-+
-     if (!libhal_ctx_set_dbus_connection(hal_ctx, dbus_conn)) {
-         fprintf(stderr, "%s: libhal_ctx_set_dbus_connection failed\n",
-                 __FUNCTION__);

libvirt-0.6.0-qemu-startup.patch

@@ -1,109 +0,0 @@
-diff -rup libvirt-0.6.0.orig/src/qemu_driver.c libvirt-0.6.0.new/src/qemu_driver.c
---- libvirt-0.6.0.orig/src/qemu_driver.c	2009-01-31 09:04:18.000000000 +0000
-+++ libvirt-0.6.0.new/src/qemu_driver.c	2009-02-18 11:15:37.000000000 +0000
-@@ -633,6 +633,7 @@ qemudReadMonitorOutput(virConnectPtr con
- {
-     int got = 0;
-     buf[0] = '\0';
-+    timeout *= 1000; /* poll wants milli seconds */
- 
-     /* Consume & discard the initial greeting */
-     while (got < (buflen-1)) {
-@@ -694,6 +695,56 @@ qemudReadMonitorOutput(virConnectPtr con
- 
- }
- 
-+
-+/*
-+ * Returns -1 for error, 0 on success
-+ */
-+static int
-+qemudReadLogOutput(virConnectPtr conn,
-+                   virDomainObjPtr vm,
-+                   int fd,
-+                   char *buf,
-+                   int buflen,
-+                   qemudHandlerMonitorOutput func,
-+                   const char *what,
-+                   int timeout)
-+{
-+    int got = 0;
-+    int ret;
-+    int retries = timeout*10;
-+    buf[0] = '\0';
-+
-+    while (retries) {
-+        while((ret = read(fd, buf+got, buflen-got-1)) > 0) {
-+            got += ret;
-+            buf[got] = '\0';
-+            if ((buflen-got-1) == 0) {
-+                qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-+                                 _("Out of space while reading %s log output"), what);
-+                return -1;
-+            }
-+        }
-+
-+        if (ret < 0 && errno != EINTR) {
-+            virReportSystemError(conn, errno,
-+                                 _("Failure while reading %s log output"),
-+                                 what);
-+            return -1;
-+        }
-+
-+        ret = func(conn, vm, buf, fd);
-+        if (ret <= 0)
-+            return ret;
-+
-+        usleep(100*1000);
-+        retries--;
-+    }
-+    if (retries == 0)
-+        qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-+                         _("Timed out while reading %s log output"), what);
-+    return -1;
-+}
-+
- static int
- qemudCheckMonitorPrompt(virConnectPtr conn ATTRIBUTE_UNUSED,
-                         virDomainObjPtr vm,
-@@ -738,7 +789,7 @@ static int qemudOpenMonitor(virConnectPt
-                                    vm, monfd,
-                                    buf, sizeof(buf),
-                                    qemudCheckMonitorPrompt,
--                                   "monitor", 10000) <= 0)
-+                                   "monitor", 10) <= 0)
-             ret = -1;
-         else
-             ret = 0;
-@@ -770,6 +821,7 @@ static int qemudOpenMonitor(virConnectPt
-     return ret;
- }
- 
-+/* Returns -1 for error, 0 success, 1 continue reading */
- static int qemudExtractMonitorPath(virConnectPtr conn,
-                                    const char *haystack,
-                                    size_t *offset,
-@@ -873,19 +925,16 @@ static int qemudWaitForMonitor(virConnec
-         < 0)
-         return -1;
- 
--    ret = qemudReadMonitorOutput(conn, vm, logfd, buf, sizeof(buf),
--                                 qemudFindCharDevicePTYs,
--                                 "console", 3000);
-+    ret = qemudReadLogOutput(conn, vm, logfd, buf, sizeof(buf),
-+                             qemudFindCharDevicePTYs,
-+                             "console", 3);
-     if (close(logfd) < 0)
-         qemudLog(QEMUD_WARN, _("Unable to close logfile: %s\n"),
-                  strerror(errno));
- 
--    if (ret == 1) /* Success */
-+    if (ret == 0) /* success */
-         return 0;
- 
--    if (ret == -1)
--        return -1;
--
-     /* Unexpected end of file - inform user of QEMU log data */
-     qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-                      _("unable to start guest: %s"), buf);

libvirt-0.6.0-rpccall.patch

@@ -1,70 +0,0 @@
-diff -rup libvirt-0.6.0.orig/qemud/event.c libvirt-0.6.0.new/qemud/event.c
---- libvirt-0.6.0.orig/qemud/event.c	2009-02-06 19:30:58.000000000 +0000
-+++ libvirt-0.6.0.new/qemud/event.c	2009-02-06 19:30:00.000000000 +0000
-@@ -657,6 +657,8 @@ virPollEventToEventHandleType(int events
-         ret |= VIR_EVENT_HANDLE_WRITABLE;
-     if(events & POLLERR)
-         ret |= VIR_EVENT_HANDLE_ERROR;
-+    if(events & POLLNVAL) /* Treat NVAL as error, since libvirt doesn't distinguish */
-+        ret |= VIR_EVENT_HANDLE_ERROR;
-     if(events & POLLHUP)
-         ret |= VIR_EVENT_HANDLE_HANGUP;
-     return ret;
-diff -rup libvirt-0.6.0.orig/src/domain_conf.c libvirt-0.6.0.new/src/domain_conf.c
---- libvirt-0.6.0.orig/src/domain_conf.c	2009-01-31 09:04:17.000000000 +0000
-+++ libvirt-0.6.0.new/src/domain_conf.c	2009-02-06 19:30:00.000000000 +0000
-@@ -504,6 +504,7 @@ virDomainObjPtr virDomainAssignDef(virCo
-     domain->state = VIR_DOMAIN_SHUTOFF;
-     domain->def = def;
-     domain->monitor_watch = -1;
-+    domain->monitor = -1;
- 
-     if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) {
-         virReportOOMError(conn);
-diff -rup libvirt-0.6.0.orig/src/remote_internal.c libvirt-0.6.0.new/src/remote_internal.c
---- libvirt-0.6.0.orig/src/remote_internal.c	2009-01-31 09:04:18.000000000 +0000
-+++ libvirt-0.6.0.new/src/remote_internal.c	2009-02-06 19:30:00.000000000 +0000
-@@ -6198,17 +6198,17 @@ processCalls(virConnectPtr conn,
-                 continue;
-             virReportSystemError(in_open ? NULL : conn, errno,
-                                  "%s", _("poll on socket failed"));
--            return -1;
-+            goto error;
-         }
- 
-         if (fds[0].revents & POLLOUT) {
-             if (processCallSend(conn, priv, in_open) < 0)
--                return -1;
-+                goto error;
-         }
- 
-         if (fds[0].revents & POLLIN) {
-             if (processCallRecv(conn, priv, in_open) < 0)
--                return -1;
-+                goto error;
-         }
- 
-         /* Iterate through waiting threads and if
-@@ -6259,9 +6259,21 @@ processCalls(virConnectPtr conn,
-         if (fds[0].revents & (POLLHUP | POLLERR)) {
-             errorf(in_open ? NULL : conn, VIR_ERR_INTERNAL_ERROR,
-                    "%s", _("received hangup / error event on socket"));
--            return -1;
-+            goto error;
-         }
-     }
-+
-+
-+error:
-+    priv->waitDispatch = thiscall->next;
-+    DEBUG("Giving up the buck due to I/O error %d %p %p", thiscall->proc_nr, thiscall, priv->waitDispatch);
-+    /* See if someone else is still waiting
-+     * and if so, then pass the buck ! */
-+    if (priv->waitDispatch) {
-+        DEBUG("Passing the buck to %d %p", priv->waitDispatch->proc_nr, priv->waitDispatch);
-+        virCondSignal(&priv->waitDispatch->cond);
-+    }
-+    return -1;
- }
- 
- /*

libvirt-0.6.0-timeout.patch

@@ -1,124 +0,0 @@
-diff -rup libvirt-0.6.0.orig/qemud/event.c libvirt-0.6.0.new/qemud/event.c
---- libvirt-0.6.0.orig/qemud/event.c	2008-12-22 13:02:54.000000000 +0000
-+++ libvirt-0.6.0.new/qemud/event.c	2009-02-06 19:29:28.000000000 +0000
-@@ -68,6 +68,7 @@ struct virEventTimeout {
- /* State for the main event loop */
- struct virEventLoop {
-     pthread_mutex_t lock;
-+    int running;
-     pthread_t leader;
-     int wakeupfd[2];
-     int handlesCount;
-@@ -521,6 +522,7 @@ int virEventRunOnce(void) {
-     int ret, timeout, nfds;
- 
-     virEventLock();
-+    eventLoop.running = 1;
-     eventLoop.leader = pthread_self();
-     if ((nfds = virEventMakePollFDs(&fds)) < 0) {
-         virEventUnlock();
-@@ -572,7 +574,7 @@ int virEventRunOnce(void) {
-         return -1;
-     }
- 
--    eventLoop.leader = 0;
-+    eventLoop.running = 0;
-     virEventUnlock();
-     return 0;
- }
-@@ -611,7 +613,9 @@ int virEventInit(void)
- static int virEventInterruptLocked(void)
- {
-     char c = '\0';
--    if (pthread_self() == eventLoop.leader)
-+
-+    if (!eventLoop.running ||
-+        pthread_self() == eventLoop.leader)
-         return 0;
- 
-     if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c))
-diff -rup libvirt-0.6.0.orig/qemud/qemud.c libvirt-0.6.0.new/qemud/qemud.c
---- libvirt-0.6.0.orig/qemud/qemud.c	2009-01-31 09:04:17.000000000 +0000
-+++ libvirt-0.6.0.new/qemud/qemud.c	2009-02-06 19:29:28.000000000 +0000
-@@ -2013,11 +2013,15 @@ static int qemudOneLoop(void) {
-     return 0;
- }
- 
--static void qemudInactiveTimer(int timer ATTRIBUTE_UNUSED, void *data) {
-+static void qemudInactiveTimer(int timerid, void *data) {
-     struct qemud_server *server = (struct qemud_server *)data;
--    DEBUG0("Got inactive timer expiry");
--    if (!virStateActive()) {
--        DEBUG0("No state active, shutting down");
-+
-+    if (virStateActive() ||
-+        server->clients) {
-+        DEBUG0("Timer expired but still active, not shutting down");
-+        virEventUpdateTimeoutImpl(timerid, -1);
-+    } else {
-+        DEBUG0("Timer expired and inactive, shutting down");
-         server->shutdown = 1;
-     }
- }
-@@ -2048,9 +2052,18 @@ static void qemudFreeClient(struct qemud
- static int qemudRunLoop(struct qemud_server *server) {
-     int timerid = -1;
-     int ret = -1, i;
-+    int timerActive = 0;
- 
-     virMutexLock(&server->lock);
- 
-+    if (timeout > 0 &&
-+        (timerid = virEventAddTimeoutImpl(-1,
-+                                          qemudInactiveTimer,
-+                                          server, NULL)) < 0) {
-+        VIR_ERROR0(_("Failed to register shutdown timeout"));
-+        return -1;
-+    }
-+
-     if (min_workers > max_workers)
-         max_workers = min_workers;
- 
-@@ -2071,11 +2084,21 @@ static int qemudRunLoop(struct qemud_ser
-          * if any drivers have active state, if not
-          * shutdown after timeout seconds
-          */
--        if (timeout > 0 && !virStateActive() && !server->clients) {
--            timerid = virEventAddTimeoutImpl(timeout*1000,
--                                             qemudInactiveTimer,
--                                             server, NULL);
--            DEBUG("Scheduling shutdown timer %d", timerid);
-+        if (timeout > 0) {
-+            if (timerActive) {
-+                if (server->clients) {
-+                    DEBUG("Deactivating shutdown timer %d", timerid);
-+                    virEventUpdateTimeoutImpl(timerid, -1);
-+                    timerActive = 0;
-+                }
-+            } else {
-+                if (!virStateActive() &&
-+                    !server->clients) {
-+                    DEBUG("Activating shutdown timer %d", timerid);
-+                    virEventUpdateTimeoutImpl(timerid, timeout * 1000);
-+                    timerActive = 1;
-+                }
-+            }
-         }
- 
-         virMutexUnlock(&server->lock);
-@@ -2129,15 +2152,6 @@ static int qemudRunLoop(struct qemud_ser
-             }
-         }
- 
--        /* Unregister any timeout that's active, since we
--         * just had an event processed
--         */
--        if (timerid != -1) {
--            DEBUG("Removing shutdown timer %d", timerid);
--            virEventRemoveTimeoutImpl(timerid);
--            timerid = -1;
--        }
--
-         if (server->shutdown) {
-             ret = 0;
-             break;

libvirt-0.6.4-svirt-sound.patch

@@ -0,0 +1,33 @@
+--- src/qemu_conf.c.orig	2009-05-29 19:24:59.000000000 +0200
++++ src/qemu_conf.c	2009-05-29 19:19:39.000000000 +0200
+@@ -792,6 +792,20 @@ int qemudBuildCommandLine(virConnectPtr 
+     char uuid[VIR_UUID_STRING_BUFLEN];
+     char domid[50];
+     const char *cpu = NULL;
++    int skipSound = 0;
++
++    if (driver->securityDriver &&
++        driver->securityDriver->name &&
++        STREQ(driver->securityDriver->name, "selinux") &&
++        getuid() == 0) {
++        static int soundWarned = 0; 
++        skipSound = 1;
++        if (def->nsounds &&
++            !soundWarned) {
++            soundWarned = 1;
++            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
++        }
++    }
+ 
+     uname_normalize(&ut);
+ 
+@@ -1429,7 +1443,8 @@ int qemudBuildCommandLine(virConnectPtr 
+     }
+ 
+     /* Add sound hardware */
+-    if (def->nsounds) {
++    if (def->nsounds &&
++        !skipSound) {
+         int size = 100;
+         char *modstr;
+         if (VIR_ALLOC_N(modstr, size+1) < 0)

libvirt.spec

@@ -1,20 +1,27 @@
 # -*- rpm-spec -*-
 
-%define with_xen       0%{!?_without_xen:1}
-%define with_xen_proxy 0%{!?_without_xen_proxy:1}
-%define with_qemu      0%{!?_without_qemu:1}
-%define with_openvz    0%{!?_without_openvz:1}
-%define with_lxc       0%{!?_without_lxc:1}
-%define with_sasl      0%{!?_without_sasl:1}
-%define with_avahi     0%{!?_without_avahi:1}
-%define with_polkit    0%{!?_without_polkit:0}
-%define with_python    0%{!?_without_python:1}
-%define with_libvirtd  0%{!?_without_libvirtd:1}
-%define with_uml       0%{!?_without_uml:1}
-%define with_network   0%{!?_without_network:1}
+%define with_xen           0%{!?_without_xen:1}
+%define with_xen_proxy     0%{!?_without_xen_proxy:1}
+%define with_qemu          0%{!?_without_qemu:1}
+%define with_openvz        0%{!?_without_openvz:1}
+%define with_lxc           0%{!?_without_lxc:1}
+%define with_vbox          0%{!?_without_vbox:1}
+%define with_sasl          0%{!?_without_sasl:1}
+%define with_avahi         0%{!?_without_avahi:1}
+%define with_polkit        0%{!?_without_polkit:1}
+%define with_python        0%{!?_without_python:1}
+%define with_libvirtd      0%{!?_without_libvirtd:1}
+%define with_uml           0%{!?_without_uml:1}
+%define with_network       0%{!?_without_network:1}
+%define with_storage_fs    0%{!?_without_storage_fs:1}
+%define with_storage_lvm   0%{!?_without_storage_lvm:1}
+%define with_storage_iscsi 0%{!?_without_storage_iscsi:1}
+%define with_storage_disk  0%{!?_without_storage_disk:1}
+%define with_numactl       0%{!?_without_numactl:1}
+
 
 # Xen is available only on i386 x86_64 ia64
-%ifnarch i386 i686 x86_64 ia64
+%ifnarch i386 i586 i686 x86_64 ia64
 %define with_xen 0
 %endif
 
@@ -41,21 +48,26 @@
 %define with_rhel5 0
 %else
 %define with_rhel5 1
+%define with_polkit 0
 %endif
 
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.6.0
-Release: 4%{?dist}%{?extra_release}
+Version: 0.6.4
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-Patch1: %{name}-%{version}-timeout.patch
-Patch2: %{name}-%{version}-rpccall.patch
-Patch3: %{name}-%{version}-qemu-startup.patch
-Patch4: %{name}-%{version}-dbus-threads.patch
-Patch5: %{name}-%{version}-autostart-timeout.patch
+
+# Patches cherry-picked from upstream
+
+# Patches not for upstream.
+
+# Temporary hack till PulseAudio autostart problems are sorted
+# out when SELinux enforcing (bz 486112)
+Patch200: libvirt-0.6.4-svirt-sound.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -78,11 +90,13 @@ Requires: cyrus-sasl-md5
 %if %{with_polkit}
 Requires: PolicyKit >= 0.6
 %endif
+%if %{with_storage_fs}
 # For mount/umount in FS driver
 BuildRequires: util-linux
 # For showmount in FS driver (netfs discovery)
 BuildRequires: nfs-utils
 Requires: nfs-utils
+%endif
 %if %{with_qemu}
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
@@ -92,12 +106,20 @@ Requires: /usr/bin/qemu-img
 Requires: /usr/sbin/qcow-create
 %endif
 %endif
+%if %{with_storage_lvm}
 # For LVM drivers
 Requires: lvm2
+%endif
+%if %{with_storage_iscsi}
 # For ISCSI driver
 Requires: iscsi-initiator-utils
+%endif
+%if %{with_storage_disk}
 # For disk driver
 Requires: parted
+%endif
+# For svirt support
+Requires: libselinux
 %if %{with_xen}
 BuildRequires: xen-devel
 %endif
@@ -123,8 +145,10 @@ BuildRequires: cyrus-sasl-devel
 %if %{with_polkit}
 BuildRequires: PolicyKit-devel >= 0.6
 %endif
+%if %{with_storage_fs}
 # For mount/umount in FS driver
 BuildRequires: util-linux
+%endif
 %if %{with_qemu}
 # From QEMU RPMs
 BuildRequires: /usr/bin/qemu-img
@@ -134,14 +158,22 @@ BuildRequires: /usr/bin/qemu-img
 BuildRequires: /usr/sbin/qcow-create
 %endif
 %endif
+%if %{with_storage_lvm}
 # For LVM drivers
 BuildRequires: lvm2
+%endif
+%if %{with_storage_iscsi}
 # For ISCSI driver
 BuildRequires: iscsi-initiator-utils
+%endif
+%if %{with_storage_disk}
 # For disk driver
 BuildRequires: parted-devel
+%endif
+%if %{with_numactl}
 # For QEMU/LXC numa info
 BuildRequires: numactl-devel
+%endif
 Obsoletes: libvir <= 0.2
 Provides: libvir = %{version}-%{release}
 
@@ -184,11 +216,8 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+
+%patch200 -p0
 
 mv NEWS NEWS.old
 iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
@@ -210,6 +239,10 @@ iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
 %define _without_lxc --without-lxc
 %endif
 
+%if ! %{with_vbox}
+%define _without_vbox --without-vbox
+%endif
+
 %if ! %{with_sasl}
 %define _without_sasl --without-sasl
 %endif
@@ -242,10 +275,31 @@ iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
 %define _without_network --without-network
 %endif
 
+%if ! %{with_storage_fs}
+%define _without_storage_fs --without-storage-fs
+%endif
+
+%if ! %{with_storage_lvm}
+%define _without_storage_lvm --without-storage-lvm
+%endif
+
+%if ! %{with_storage_iscsi}
+%define _without_storage_iscsi --without-storage-iscsi
+%endif
+
+%if ! %{with_storage_disk}
+%define _without_storage_disk --without-storage-disk
+%endif
+
+%if ! %{with_numactl}
+%define _without_numactl --without-numactl
+%endif
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
            %{?_without_lxc} \
+           %{?_without_vbox} \
            %{?_without_sasl} \
            %{?_without_avahi} \
            %{?_without_polkit} \
@@ -254,6 +308,11 @@ iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
            %{?_without_uml} \
            %{?_without_network} \
            %{?_with_rhel5_api} \
+           %{?_without_storage_fs} \
+           %{?_without_storage_lvm} \
+           %{?_without_storage_iscsi} \
+           %{?_without_storage_disk} \
+           %{?_without_numactl} \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid
@@ -264,7 +323,10 @@ rm -rf %{buildroot}
 
 %makeinstall
 (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in)
-(cd docs/examples/python ; rm -f Makefile Makefile.in)
+(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in)
+(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in)
+(cd examples/domain-events/events-c ;  make clean ;rm -rf .deps .libs Makefile Makefile.in)
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
@@ -272,8 +334,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/
 # Default dir for disk images defined in SELinux policy
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/
-# Default dir for kernel+initrd images defnied in SELinux policy
+# Default dir for kernel+initrd images defined in SELinux policy
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/
+# used for virDomainMemoryPeek
+install -d -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/cache/libvirt/
 
 %if %{with_qemu}
 # We don't want to install /etc/libvirt/qemu/networks in the main %files list
@@ -345,8 +409,10 @@ fi
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README COPYING.LIB TODO
-%doc %{_mandir}/man1/virsh.1*
+%{_mandir}/man1/virsh.1*
+%{_mandir}/man1/virt-xml-validate.1*
 %{_bindir}/virsh
+%{_bindir}/virt-xml-validate
 %{_libdir}/lib*.so.*
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
 
@@ -392,6 +458,7 @@ fi
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
+%dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/
 
 %if %{with_qemu}
 %dir %{_localstatedir}/run/libvirt/qemu/
@@ -454,6 +521,7 @@ fi
 %dir %{_includedir}/libvirt
 %{_includedir}/libvirt/*.h
 %{_libdir}/pkgconfig/libvirt.pc
+%dir %{_datadir}/gtk-doc/html/libvirt
 %doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp
 %doc %{_datadir}/gtk-doc/html/libvirt/*.html
 %doc %{_datadir}/gtk-doc/html/libvirt/*.png
@@ -462,6 +530,7 @@ fi
 %doc docs/*.html docs/html docs/*.gif
 %doc docs/examples
 %doc docs/libvirt-api.xml
+%doc examples
 
 %if %{with_python}
 %files python
@@ -477,6 +546,96 @@ fi
 %endif
 
 %changelog
+* Fri May 29 2009 Daniel Veillard <veillard@redhat.com> - 0.6.4-1.fc12
+- Upstream release of 0.6.4
+- new APIs
+- fixes for latests QEmu/KVM versions
+- various assorted fixes
+
+* Mon May 25 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-11.fc12
+- Bring up the bridge, even if it doesn't have an IP address (bug #501912)
+
+* Thu May 21 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-10.fc12
+- Fix XML attribute escaping (bug #499791)
+- Fix serious event handling issues causing guests to be destroyed (bug #499698)
+
+* Thu May 21 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-9.fc12
+- Fix qemu argv detection with latest qemu (bug #501923)
+
+* Sun May 10 2009 Cole Robinson <crobinso@redhat.com> - 0.6.2-8.fc12
+- Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569)
+
+* Thu May  7 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-7.fc12
+- Enable migration for qemu 0.10 (bug #499704)
+
+* Wed May  6 2009 Cole Robinson <crobinso@redhat.com> - 0.6.3-6.fc12
+- Refresh qemu caps when getCapabilities is called (bug #460649)
+
+* Wed May  6 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-5.fc12
+- Fix handling of <hostdev managed='yes'> (bug #499386)
+
+* Tue May  5 2009 Daniel Berrange <berrange@redhat.com> - 0.6.3-4.fc12
+- Fix readonly/shared disk image labelling (rhbz #493692)
+
+* Tue Apr 28 2009 Daniel Veillard <veillard@redhat.com> - 0.6.3-3.fc12
+- was also missing /usr/share/gtk-doc/html/libvirt in -devel
+
+* Tue Apr 28 2009 Daniel Veillard <veillard@redhat.com> - 0.6.3-2.fc12
+- fix packaging bug #496945 libvirt should own /var/cache/libvirt
+
+* Fri Apr 24 2009 Daniel Veillard <veillard@redhat.com> - 0.6.3-1.fc12
+- release of 0.6.3
+- VirtualBox driver
+- new virt-xml-validate command
+- assorted bug fixes
+
+* Thu Apr 16 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-2.fc12
+- Fix qemu drive format specification (#496092)
+
+* Fri Apr  3 2009 Daniel Veillard <veillard@redhat.com> - 0.6.2-1.fc11
+- release of 0.6.2
+- memory ballooning in QEMU
+- SCSI HBA storage pool support
+- support SASL auth for VNC server
+- PCI passthrough in Xen driver
+- assorted bug fixes
+
+* Fri Apr  3 2009 Daniel P. Berrange  <berrange@redhat.com> - 0.6.1-6.fc11
+- Fix typo in previous patch
+
+* Tue Mar 17 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.1-5.fc11
+- Don't relabel shared/readonly disks
+- Disable sound cards when running sVirt
+
+* Tue Mar 17 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.1-4.fc11
+- Fix memory allocation for xend lookup
+- Avoid crash if storage volume deletion fails
+- Fix multiple FD leaks
+- Fix bug in dispatch FD events when a callback is marked deleted
+- Fix parsing of storage volume owner/group/mode
+- Fix memory allocation for virDomainGetVcpus RPC handler
+- Avoid deadlock in setting vCPU count
+- Use correct driver name in Xen block detach
+
+* Mon Mar  9 2009 Cole Robinson <crobinso@redhat.com> - 0.6.1-3.fc11
+- Add Requires: libselinux
+
+* Fri Mar  6 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.1-2.fc11
+- Fix crash after storage vol deletion fails
+- Add patch to enable VNC SASL authentication
+
+* Wed Mar  4 2009 Daniel Veillard <veillard@redhat.com> - 0.6.1-1.fc11
+- upstream release 0.6.1
+- support for node device detach reattach and reset
+- sVirt mandatory access control support
+- many bug fixes and small improvements
+
+* Mon Mar  2 2009 Daniel Veillard <veillard@redhat.com> - 0.6.0-6.fc11
+- make sure Xen is handled in i586 new default 32bits x86 packages
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-5.fc11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 18 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.0-4.fc11
 - Fix QEMU startup timeout/race (rhbz #484649)
 - Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553)

sources

@@ -1 +1 @@
-8e0120d5452b37179f682031bf0895ea  libvirt-0.6.0.tar.gz
+344a6913a94582ea3ab0ad75a9bfef22  libvirt-0.6.4.tar.gz