* Wed Jul 29 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.4.gitf055724

- Drop explicit libselinux requires, it is autorequired
- Drop cleanup of python/tests, apparently not needed
- Cherry-pick upstream patch to convert NEWS to UTF-8, drop iconv
- Drop python BR; python-devel requires it

.cvsignore

@@ -6,3 +6,7 @@ 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.5.tar.gz
+libvirt-0.7.0-0.1.gitf055724.tar.gz

libvirt-0.6.4-svirt-sound.patch

@@ -1,8 +1,8 @@
---- src/qemu_conf.c.orig	2009-04-02 11:50:10.000000000 +0200
-+++ src/qemu_conf.c	2009-04-03 17:46:59.000000000 +0200
-@@ -779,6 +779,20 @@ int qemudBuildCommandLine(virConnectPtr 
+--- 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];
-     char *pidfile;
      const char *cpu = NULL;
 +    int skipSound = 0;
 +
@@ -12,7 +12,7 @@
 +        getuid() == 0) {
 +        static int soundWarned = 0; 
 +        skipSound = 1;
-+        if (vm->def->nsounds &&
++        if (def->nsounds &&
 +            !soundWarned) {
 +            soundWarned = 1;
 +            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
@@ -21,12 +21,12 @@
  
      uname_normalize(&ut);
  
-@@ -1425,7 +1439,8 @@ int qemudBuildCommandLine(virConnectPtr 
+@@ -1429,7 +1443,8 @@ int qemudBuildCommandLine(virConnectPtr 
      }
  
      /* Add sound hardware */
--    if (vm->def->nsounds) {
-+    if (vm->def->nsounds &&
+-    if (def->nsounds) {
++    if (def->nsounds &&
 +        !skipSound) {
          int size = 100;
          char *modstr;

libvirt-convert-news-to-utf8.patch

@@ -0,0 +1,248 @@
+From 50f5a6c7ab7795fb6ade4bb24849fa2bab5084dd Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Wed, 29 Jul 2009 08:40:17 +0100
+Subject: [PATCH] Convert NEWS to UTF-8
+
+* docs/news.xsl: request UTF-8 as the output encoding
+
+* NEWS: re-generate with UTF-8 encoding
+---
+ NEWS          |   70 ++++++++++++++++++++++++++++----------------------------
+ docs/news.xsl |    2 +-
+ 2 files changed, 36 insertions(+), 36 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 447d2b4..0a838b9 100644
+--- a/NEWS
++++ b/NEWS
+@@ -137,7 +137,7 @@
+    - Improvements: add SCSI storage rescan (David Allan), rootless
+           LXC containers support improvements (Serge Hallyn), getHostname
+           support for LXC (Dan Smith), cleanup and logging output of some
+-          domain functions (Guido G<>nther), drop pool lock when allocating
++          domain functions (Guido Günther), drop pool lock when allocating
+           volumes (Cole Robinson), LXC handle kernel without CLONE_NEWUSER
+           support (Serge Hallyn), cpu pinning on defined Xen domains (Takahashi
+           Tomohiro), dynamic bridge names support (Soren Hansen), LXC use
+@@ -145,7 +145,7 @@
+           virNodeDeviceCreateXML and virNodeDeviceDestroy entry points
+           (Dave Allan)
+    - Cleanups: don't hardcode getgrnam_r buffer to 1024 bytes (Guido
+-          G<>nther), qemudBuildCommandLine API cleanup (Daniel Berrange),
++          Günther), qemudBuildCommandLine API cleanup (Daniel Berrange),
+           
+ 
+ 
+@@ -214,15 +214,15 @@
+           to avoid crashes (Daniel Berrange), mark defined network descriptions
+           as persistent (Cole Robinson), qemu+tls handshake negotiation hang
+           (Chris Lalancette)
+-   - Improvements: don't hardcode ssh port (Guido G<>nther), new test
++   - Improvements: don't hardcode ssh port (Guido Günther), new test
+           cases and testing infrastructure (Jim Meyering), improve the
+           SExpr parser (John Levon), proper error reporting on xend
+           shutdown command (John Levon), proper handling of errors when
+-          saving QEmu domains state (Guido G<>nther), revamp of the internal
++          saving QEmu domains state (Guido Günther), revamp of the internal
+           error memory APIs (John Levon), better virsh error reporting (John
+           Levon), more daemon options to allow running multiple daemons (Jim
+-          Meyering), error handling when creating a QEmu domain (Guido G<>nther),
+-          fix timeouts in QEmu log reading (Guido G<>nther), migration with
++          Meyering), error handling when creating a QEmu domain (Guido Günther),
++          fix timeouts in QEmu log reading (Guido Günther), migration with
+           xend 3.3 fixes (John Levon), virsh XML dump flags cleanup (Cole
+           Robinson), fix build with loadable drivers (Maximilian Wilhelm),
+           internal XML APIs to read long long and hexa values (Mark
+@@ -236,7 +236,7 @@
+           (Jim Meyering), many error handling cleanups (Jim Meyering), XML
+           module cleanups (Mark McLoughlin), compiler warning (Maximilian
+           Wilhelm), daemon TCP listen cleanup (Cole Robinson), size_t type
+-          cleanup (Guido G<>nther), parallel make fix (Michael Marineau),
++          cleanup (Guido Günther), parallel make fix (Michael Marineau),
+           storage error diagnostic fix (Ryota Ozaki), remove redundant monitor
+           watch variable (Cole Robinson), qemu AttachDevice error report
+           improvement (Cole Robinson), virsh output cleanup (Jim Meyering),
+@@ -248,7 +248,7 @@
+ 0.6.0: Jan 31 2009:
+    - New features: thread safety of the API and event handling (Daniel
+           Berrange), allow QEmu domains to survive daemon restart (Guido
+-          G<>nther), extended logging capabilities, support copy-on-write
++          Günther), extended logging capabilities, support copy-on-write
+           storage volumes (Daniel Berrange), support of storage cache
+           control options for QEmu/KVM (Daniel Berrange)
+    - Portability: fix old DBus API problem, Debian portability fix
+@@ -260,13 +260,13 @@
+           solaris Xen fixes (John Levon), RPC portability to Solaris (Daniel
+           Berrange)
+    - Documentation: typo fixes (Richard Jones), logging support,
+-          vnc keymap attributes (Guido G<>nther), HACKING file updates
++          vnc keymap attributes (Guido Günther), HACKING file updates
+          (Jim Meyering), new PCI passthrough format, libvirt-qpid and
+          UML driver documentation (Daniel Berrange), provide RNG schemas
+          for all XML formats used in libvirt APIs (Daniel Berrange), 
+    - Bug fixes: segfault on virtual network without bridge name (Cole
+           Robinson), various locking fixes (Cole Robinson), fix serial
+-          and parallel devices on tcp/unix/telnet (Guido G<>nther), leak
++          and parallel devices on tcp/unix/telnet (Guido Günther), leak
+           in daemon (Jim Meyering), storage driver segfault (Miloslav TrmaC),
+           missing check in read-only connections (Daniel Berrange),
+           OpenVZ crash and mutex fixes (Anton Protopopov), couple of
+@@ -282,15 +282,15 @@
+    - Improvements: driver infrastructure and locking (Daniel Berrange),
+           Test driver infrastructure (Daniel Berrange), parallelism in the
+           daemon and associated config (Daniel Berrange), virsh help cleanups
+-          (Jim Meyering), logrotate daemon logs (Guido G<>nther), more
++          (Jim Meyering), logrotate daemon logs (Guido Günther), more
+           regression tests (Jim Meyering), QEmu SDL graphics (Itamar Heim),
+           add --version flag to daemon (Dave Allan), memory consumption
+           cleanup (Dave Allan), QEmu pid file and XML states for daemon
+-          restart (Guido G<>nther), gnulib updates (Jim Meyering and
++          restart (Guido Günther), gnulib updates (Jim Meyering and
+           Dan Berrange), PCI passthrough for KVM (Jason Krieg), generic
+           internal thread API (Daniel Berrange), RHEL-5 specific Xen
+           configure option and code (Markus Armbruster), save domain
+-          state as string in status file (Guido G<>nther), add locking
++          state as string in status file (Guido Günther), add locking
+           to all API entry points (Daniel Berrange), new ref counting APIs
+           (Daniel Berrange), IP address for Xen bridges (John Levon),
+           driver format for disk file types (Daniel Berrange), improve
+@@ -303,15 +303,15 @@
+           (Jim Meyering), gethostby* cleanup and test (Jim Meyering), some
+            code fixes (Dave Allan), various code cleanup (Jim Meyering),
+            virsh argument handling cleanup (Jim Meyering), virAsprintf
+-           cleanup replacement (Guido G<>nther), QEmu monitor reads (Cole
+-           Robinson), Makefile cleanups (Guido G<>nther), Xen code cleanups
++           cleanup replacement (Guido Günther), QEmu monitor reads (Cole
++           Robinson), Makefile cleanups (Guido Günther), Xen code cleanups
+            (John Levon), revamp of ELF export scripts (John Levon), domain
+            event callback args (John Levon), enforce use of pid_t (John Levon),
+            virsh pool-*-as XML code merge (Cole Robinson), xgettext warnings
+-           (Jim Meyering), add virKillProcess (Guido G<>nther), add
++           (Jim Meyering), add virKillProcess (Guido Günther), add
+            virGetHostname (David Lutterkort), add flags argument to the full
+-           XML parsing stack (Guido G<>nther), various daemon code cleanups
+-           (Guido G<>nther), handling of daemon missing config file (Jim
++           XML parsing stack (Guido Günther), various daemon code cleanups
++           (Guido Günther), handling of daemon missing config file (Jim
+            Meyering), rpcgen invocation cleanup (Richard Jones), devhelp
+            builkd makefile cleanups (John Levon), update error handling for
+            threading (Daniel Berrange), remove all non-rentrant POSIX calls
+@@ -331,7 +331,7 @@
+    - Bug fixes: add a delay in storage backend for disks to show up
+           (Chris Lalancette), fix parsing for CDRom device with no source
+           (Daniel Berrange), use xenstore to list domains to avoid some
+-          bugs (Guido G<>nther), remove a leak in xen inotify code (Daniel
++          bugs (Guido Günther), remove a leak in xen inotify code (Daniel
+           Berrange), UML driver freeing of uninitialialized variable (Ron
+           Yorston), fix UML inotify code (Daniel Berrange), crash when
+           adding storage without a format (Cole Robinson)
+@@ -339,8 +339,8 @@
+           max memory (Jim Fehlig), allow remote://hostname/ URI for automatic
+           probe of hypervisors (Daniel Berrange), fix daemon configuration
+           regression testing (Jim Meyering ), check /usr/bin/kvm for QEmu
+-          driver init (Guido G<>nther), proper active vs. inactive
+-          differentiation (Guido G<>nther), improve MTU setting on tap
++          driver init (Guido Günther), proper active vs. inactive
++          differentiation (Guido Günther), improve MTU setting on tap
+           interfaces (Eduardo Habkost), increase timeout for initial QEmu
+           monitor poll (Cole Robinson)
+    - Cleanups:fix improper initialisations (Jim Meyering)
+@@ -350,9 +350,9 @@
+    - New features: CPU and scheduler support for LXC (Dan Smith), SDL display configuration (Daniel Berrange), domain lifecycle event support for QEmu and Xen with python bindings (Ben Guthro and Daniel Berrange), KVM/QEmu migration support (Rich Jones and Chris Lalancette), User Mode Linux driver (Daniel Berrange), API for node device enumeration using HAL and DeviceKit with python bindings (David Lively), 
+    - Portability: RHEL build fixes, VPATH build (Guido Gunther), many MinGW related cleanups and fixes (Richard Jones), compilation without libvirtd (Richard Jones), Add a Windows icon (Richard Jones), sys/poll.h portability fixes (Daniel Berrange), gnulib and mingw cleanups (Jim Meyering), 
+    - Documentation: virsh man page cleanups (Mark McLoughlin), doc for NIC model selection (Richard Jones), monitoring section, link to AMQP bindings, inew APIs, UML driver docs (Daniel Berrange), 
+-   - Bug fixes: Xen interfaces ordering (Jim Fehlig), startup timeout with multiple pty (Cole Robinson), segfault if QEmu without active virtual network (Cole Robinson), qemu small leak (Eduardo Habkost), index creation for more than 26 disks (Sanjay Rao and Chris Wright), virRealloc handling of 0 (Daniel Berrange), missing pointer initialization (Chris Lalancette), bus device index bug (Guido G<>nther), avoid crash in some error patch (Chris Lalancette), fix a problem in storage back-end (Chris Lalancette), minimum domain memory size check for Xen (Shigeki Sakamoto), switch off QEmu cache if device is shared (Charles Duffy), logical volume definition before scan bug (Chris Lalancette), a couple of memory leaks on QEmu vnc (Jim Meyering), lvs parsing fixes (Cole Robinson),  
+-   - Improvements: LXC resources control and internal cgroup API (Dan Smith), virDomainCreateLinux renamed virDomainDefineXML, network driver modularization (Daniel Berrange), change the way domain and net are reported in errors (Jim Meyering), partition table scan on iSCSI (Chris Lalancette), qemudDiskDeviceName to handle normal disks (Guido G<>nther), qemudDomainBlockStats improvement (Guido G<>nther), scsi/virtio hotplug support for KVM (Guido G<>nther), USB hot addition in QEmu (Guido G<>nther), logical pool and storage backend XML dump improvement (Chris Lalancette), MAC addresses prefix per driver (Daniel Berrange), OpenVZ getVersion support (Daniel Berrange), hot removal of scsi/virtio disks for KVM (Guido G<>nther), test storage driver (Cole Robinson), iSCSI and disk storage driver improvement on path handling (Chris Lalancette), UUID and ID support for Xenner (Daniel Berrange), better logging when when executing commands (Cole Robinson), bridged network for OpenVZ (Daniel Berrange), OpenVZ config file params (Evgeniy Sokolov), allow to build drivers as libtool convenience libs (Daniel Berrange), fully versioned linker script for exported ABI (Daniel Berrange), Push URI probing down into drivers open (Daniel Berrange), move all stateful drivers into the daemon binary (Daniel Berrange), improve domain event with a detail field (Daniel Berrange), domain events for QEMU driver (Daniel Berrange), event unregister callback crash (David Lively), plug a few leaks (Daniel Berrange), internal APIs for handling node device XML config (David Lively), tweaks to node device implementation (Daniel Berrange), OpenVZ vCPUs values init (Evgeniy Sokolov)
+-   - Cleanups: C99 initializers (Guido Gunther), test output (Cole Robinson), debug macro centralization (Cole Robinson), various error handling (Guido G<>nther), safewrite use cleanup (Jim Meyering), centralize error reporting logic (Cole Robinson), avoid printf warnings (Daniel Berrange), use arrays instead of list for internal APIs (Daniel Berrange), remove many format string warnings Jim Meyering), avoid syntax check warnings (Chris Lalancette), improve po-check and list generation (Jim Meyering), .gitignore generation and handling (Jim Meyering), use ARRAY_CARDINALITY (Jim Meyering), gnulib updates and switch to use netdb.h (Jim Meyering), drop usage of socket_errno (Jim Meyering), remove socketcompat.h (Jim Meyering), more tests (Jim Meyering), drop virStringList (Daniel Berrange), reformatting and isolation of the error APIs (Daniel Berrange), cleanup internal.h and move internal APIs in specific headers (Daniel Berrange), move domain events helpers into domain_events.c (Daniel Berrange), cleanup the way optional modules are compiled (Daniel Berrange), add new logging module, optional dlopen of drivers (Daniel Berrange), various new tests (Jim Meyering), cleanups when Xen is not configured in (Daniel Berrange), add some missing functions comments (Jim Meyering), 
++   - Bug fixes: Xen interfaces ordering (Jim Fehlig), startup timeout with multiple pty (Cole Robinson), segfault if QEmu without active virtual network (Cole Robinson), qemu small leak (Eduardo Habkost), index creation for more than 26 disks (Sanjay Rao and Chris Wright), virRealloc handling of 0 (Daniel Berrange), missing pointer initialization (Chris Lalancette), bus device index bug (Guido Günther), avoid crash in some error patch (Chris Lalancette), fix a problem in storage back-end (Chris Lalancette), minimum domain memory size check for Xen (Shigeki Sakamoto), switch off QEmu cache if device is shared (Charles Duffy), logical volume definition before scan bug (Chris Lalancette), a couple of memory leaks on QEmu vnc (Jim Meyering), lvs parsing fixes (Cole Robinson),  
++   - Improvements: LXC resources control and internal cgroup API (Dan Smith), virDomainCreateLinux renamed virDomainDefineXML, network driver modularization (Daniel Berrange), change the way domain and net are reported in errors (Jim Meyering), partition table scan on iSCSI (Chris Lalancette), qemudDiskDeviceName to handle normal disks (Guido Günther), qemudDomainBlockStats improvement (Guido Günther), scsi/virtio hotplug support for KVM (Guido Günther), USB hot addition in QEmu (Guido Günther), logical pool and storage backend XML dump improvement (Chris Lalancette), MAC addresses prefix per driver (Daniel Berrange), OpenVZ getVersion support (Daniel Berrange), hot removal of scsi/virtio disks for KVM (Guido Günther), test storage driver (Cole Robinson), iSCSI and disk storage driver improvement on path handling (Chris Lalancette), UUID and ID support for Xenner (Daniel Berrange), better logging when when executing commands (Cole Robinson), bridged network for OpenVZ (Daniel Berrange), OpenVZ config file params (Evgeniy Sokolov), allow to build drivers as libtool convenience libs (Daniel Berrange), fully versioned linker script for exported ABI (Daniel Berrange), Push URI probing down into drivers open (Daniel Berrange), move all stateful drivers into the daemon binary (Daniel Berrange), improve domain event with a detail field (Daniel Berrange), domain events for QEMU driver (Daniel Berrange), event unregister callback crash (David Lively), plug a few leaks (Daniel Berrange), internal APIs for handling node device XML config (David Lively), tweaks to node device implementation (Daniel Berrange), OpenVZ vCPUs values init (Evgeniy Sokolov)
++   - Cleanups: C99 initializers (Guido Gunther), test output (Cole Robinson), debug macro centralization (Cole Robinson), various error handling (Guido Günther), safewrite use cleanup (Jim Meyering), centralize error reporting logic (Cole Robinson), avoid printf warnings (Daniel Berrange), use arrays instead of list for internal APIs (Daniel Berrange), remove many format string warnings Jim Meyering), avoid syntax check warnings (Chris Lalancette), improve po-check and list generation (Jim Meyering), .gitignore generation and handling (Jim Meyering), use ARRAY_CARDINALITY (Jim Meyering), gnulib updates and switch to use netdb.h (Jim Meyering), drop usage of socket_errno (Jim Meyering), remove socketcompat.h (Jim Meyering), more tests (Jim Meyering), drop virStringList (Daniel Berrange), reformatting and isolation of the error APIs (Daniel Berrange), cleanup internal.h and move internal APIs in specific headers (Daniel Berrange), move domain events helpers into domain_events.c (Daniel Berrange), cleanup the way optional modules are compiled (Daniel Berrange), add new logging module, optional dlopen of drivers (Daniel Berrange), various new tests (Jim Meyering), cleanups when Xen is not configured in (Daniel Berrange), add some missing functions comments (Jim Meyering), 
+ 
+ 
+ 0.4.6: Sep 23 2008:
+@@ -364,7 +364,7 @@
+           OpenVZ (Evgeniy Sokolov), fix parsing of pool without a source
+           (Chris Lalancette and Daniel Berrange)
+    - Improvements: add storage disk volume delete (Cole Robinson),
+-          KVM dynamic max CPU detection (Guido G<>nther), spec file improvement
++          KVM dynamic max CPU detection (Guido Günther), spec file improvement
+           for minimal builds (Ben Guthro), improved error message in XM
+           configuration module (Richard Jones), network config in OpenVZ
+           support (Evgeniy Sokolov), enable stopping a pool in logical
+@@ -379,7 +379,7 @@
+           unified XML domain and network parsing for all drivers (Daniel
+           Berrange), OpenVZ features improvements (Evgeniy Sokolov),
+           OpenVZ and Linux containers support now default, USB device
+-          passthrough for QEmu/KVM (Guido G<>nther), storage pool source
++          passthrough for QEmu/KVM (Guido Günther), storage pool source
+           discovery (David Lively)
+    - Portability: fixes for MinGW (Atsushi SAKAI and Daniel Berrange),
+           detection of xen lib improvement (David Lively),
+@@ -389,9 +389,9 @@
+           SAKAI and Daniel Berrange), HTML generation fix, -lpthread explicit
+           linking when needed (Jim Meyering)
+    - Documentation: various typo fixes (Anton Protopopov, Toth
+-          Istv<74>n, Atsushi SAKAI, Nguyen Anh Quynh),
++          István, Atsushi SAKAI, Nguyen Anh Quynh),
+           Java bindings docs, remove Xen centric
+-          comments (Guido G<>nther), various typo in comments (Chris
++          comments (Guido Günther), various typo in comments (Chris
+           Lalancette), docs and API comments fixes (Charles Duffy),
+           how to contribute to open source link (Richard Jones),
+           memory unit fixups (matthew chan)
+@@ -401,14 +401,14 @@
+           in QEmu/KVM (Daniel Berrange), fix OpenVZ probe function (Evgeniy
+           Sokolov), ID related lookup fixes in OpenVZ (Evgeniy Sokolov),
+           pool cration for netfs (Cole Robinson), check for migrate support
+-          with QEmu (Guido G<>nther), check against double create with QEmu
+-          (Guido G<>nther), broken open failure detection in QEmu (Guido
+-          G<>nther), UUID string conversions in QEmu (Guido G<>nther),
++          with QEmu (Guido Günther), check against double create with QEmu
++          (Guido Günther), broken open failure detection in QEmu (Guido
++          Günther), UUID string conversions in QEmu (Guido Günther),
+           various small cleanup and bug fixes (Daniel Berrange), ID
+           related fixes in the test driver (Daniel Berrange), better error
+           reporting on XML parsing (Daniel Berrange), empty CD-ROM source
+           device section (Chris Lalancette), avoid crashes for interface
+-          without a name in QEmu (Guido G<>nther), provide the real
++          without a name in QEmu (Guido Günther), provide the real
+           vncport (Charles Duffy), fix forward delay (Daniel Berrange),
+           new VM state is initialized to be SHUTOFF (Daniel Berrange),
+           virsh attach-disk bug fixes (Chris Lalancette), veth clash
+@@ -440,7 +440,7 @@
+           (Daniel Berrange), virsh "edit" command (Richard Jones), save
+           UUID of OpenVZ domains (Evgeniy Sokolov), improve xen blocks
+           statistics (Chris Lalancette), gnulib updates (Jim Meyering),
+-          allow to add disk as USB devices (Guido G<>nther), LXC container
++          allow to add disk as USB devices (Guido Günther), LXC container
+           process should survive libvirtd restarts (Daniel Berrange), allow
+           to define static host domain configs, number of CPU used by
+           OpenVZ domains (Evgeniy Sokolov), private root fs for LXC (Daniel
+@@ -572,9 +572,9 @@
+       driver (Cole Robinson), xen and hvm added to test driver capabilities
+       (Cole Robinson)
+    - Code cleanup: remove unused getopt header (Jim Meyering), mark more
+-      strings as translatable (Guido G<>nther and Jim Meyering), convert
++      strings as translatable (Guido Günther and Jim Meyering), convert
+       error strings to something meaningful and translatable (Jim Meyering),
+-      Linux Containers code cleanup, last error initializer (Guido G<>nther)
++      Linux Containers code cleanup, last error initializer (Guido Günther)
+ 
+ 
+ 0.4.1: Mar 3 2008:
+diff --git a/docs/news.xsl b/docs/news.xsl
+index a190120..e35030e 100644
+--- a/docs/news.xsl
++++ b/docs/news.xsl
+@@ -1,7 +1,7 @@
+ <?xml version="1.0"?>
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 version="1.0">
+-  <xsl:output method="text" encoding="ISO-8859-1"/>
++  <xsl:output method="text" encoding="UTF-8"/>
+ 
+   <xsl:template match="/">
+     <xsl:text>
+-- 
+1.6.2.5
+

libvirt.spec

@@ -1,36 +1,29 @@
 # -*- 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:0}
+%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_one           0%{!?_without_one:1}
+# default to off
+%define with_phyp          0%{!?_without_phyp:0}
 %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}
-
+# default to off
+%define with_capng         0%{!?_without_capng:0}
+%define with_netcf         0%{!?_without_netcf:1}
 
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i586 i686 x86_64 ia64
@@ -52,48 +45,60 @@
 %define with_xen_proxy 0
 %endif
 
+%if 0%{?fedora} >= 12
+%define with_capng     0%{!?_without_capng:1}
+%endif
+
+%if 0%{?fedora} >= 12
+%define with_netcf     0%{!?_without_netcf:1}
+%endif
+
+%if 0%{?fedora} >= 12
+%define qemu_user  qemu
+%define qemu_group  qemu
+%else
+%define qemu_user  root
+%define qemu_group  root
+%endif
+
 #
 # If building on RHEL switch on the specific support
-# for the specific Xen version
 #
 %if 0%{?fedora}
-%define with_rhel5 0
+%define with_rhel5  0
 %else
-%define with_rhel5 1
+%define with_rhel5  1
+%define with_polkit 0
+%define with_one    0
 %endif
 
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.6.2
-Release: 1%{?dist}%{?extra_release}
+Version: 0.7.0
+Release: 0.4.gitf055724%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
-Source: libvirt-%{version}.tar.gz
+Source: libvirt-0.7.0-0.1.gitf055724.tar.gz
 
-# Not for upstream. Temporary hack till PulseAudio autostart
-# problems are sorted out when SELinux enforcing
-Patch200: libvirt-0.6.2-svirt-sound.patch
+Patch01: libvirt-convert-news-to-utf8.patch
+
+# 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
-Requires: readline
-Requires: ncurses
+BuildRequires: python-devel
+
+# The client side, i.e. shared libs and virsh are in a subpackage
+Requires: libvirt-client = %{version}-%{release}
+
 Requires: dnsmasq
 Requires: bridge-utils
 Requires: iptables
 # needed for device enumeration
 Requires: hal
-# So remote clients can access libvirt over SSH tunnel
-# (client invokes 'nc' against the UNIX socket on the server)
-Requires: nc
-%if %{with_sasl}
-Requires: cyrus-sasl
-# Not technically required, but makes 'out-of-box' config
-# work correctly & doesn't have onerous dependencies
-Requires: cyrus-sasl-md5
-%endif
 %if %{with_polkit}
 Requires: PolicyKit >= 0.6
 %endif
@@ -103,6 +108,8 @@ BuildRequires: util-linux
 # For showmount in FS driver (netfs discovery)
 BuildRequires: nfs-utils
 Requires: nfs-utils
+# For glusterfs
+Requires: glusterfs-client >= 2.0.1
 %endif
 %if %{with_qemu}
 # From QEMU RPMs
@@ -125,11 +132,12 @@ Requires: iscsi-initiator-utils
 # For disk driver
 Requires: parted
 %endif
-# For svirt support
-Requires: libselinux
 %if %{with_xen}
 BuildRequires: xen-devel
 %endif
+%if %{with_one}
+BuildRequires: xmlrpc-c-devel >= 1.14.0
+%endif
 BuildRequires: libxml2-devel
 BuildRequires: xhtml1-dtds
 BuildRequires: readline-devel
@@ -143,9 +151,6 @@ BuildRequires: avahi-devel
 BuildRequires: libselinux-devel
 BuildRequires: dnsmasq
 BuildRequires: bridge-utils
-%if %{with_qemu}
-BuildRequires: qemu
-%endif
 %if %{with_sasl}
 BuildRequires: cyrus-sasl-devel
 %endif
@@ -181,15 +186,42 @@ BuildRequires: parted-devel
 # For QEMU/LXC numa info
 BuildRequires: numactl-devel
 %endif
-Obsoletes: libvir <= 0.2
-Provides: libvir = %{version}-%{release}
+%if %{with_capng}
+BuildRequires: libcap-ng-devel >= 0.5.0
+%endif
+%if %{with_phyp}
+BuildRequires: libssh-devel >= 0.3.1
+%endif
+%if %{with_netcf}
+BuildRequires: netcf-devel
+%endif
 
 # Fedora build root suckage
 BuildRequires: gawk
 
 %description
 Libvirt is a C toolkit to interact with the virtualization capabilities
-of recent versions of Linux (and other OSes).
+of recent versions of Linux (and other OSes). The main package includes
+the libvirtd server exporting the virtualization support.
+
+%package client
+Summary: client side library and utilities of the libvirt library
+Group: Development/Libraries
+Requires: readline
+Requires: ncurses
+# So remote clients can access libvirt over SSH tunnel
+# (client invokes 'nc' against the UNIX socket on the server)
+Requires: nc
+%if %{with_sasl}
+Requires: cyrus-sasl
+# Not technically required, but makes 'out-of-box' config
+# work correctly & doesn't have onerous dependencies
+Requires: cyrus-sasl-md5
+%endif
+
+%description client
+Shared libraries and client binaries needed to access to the
+virtualization capabilities of recent versions of Linux (and other OSes).
 
 %package devel
 Summary: Libraries, includes, etc. to compile with the libvirt library
@@ -199,8 +231,6 @@ Requires: pkgconfig
 %if %{with_xen}
 Requires: xen-devel
 %endif
-Obsoletes: libvir-devel <= 0.2
-Provides: libvir-devel = %{version}-%{release}
 
 %description devel
 Includes and documentations for the C library providing an API to use
@@ -211,8 +241,6 @@ the virtualization capabilities of recent versions of Linux (and other OSes).
 Summary: Python bindings for the libvirt library
 Group: Development/Libraries
 Requires: libvirt = %{version}-%{release}
-Obsoletes: libvir-python <= 0.2
-Provides: libvir-python = %{version}-%{release}
 
 %description python
 The libvirt-python package contains a module that permits applications
@@ -224,10 +252,9 @@ of recent versions of Linux (and other OSes).
 %prep
 %setup -q
 
-%patch200 -p0
+%patch01 -p1
 
-mv NEWS NEWS.old
-iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
+%patch200 -p0
 
 %build
 %if ! %{with_xen}
@@ -246,6 +273,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
@@ -254,6 +285,10 @@ iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
 %define _without_avahi --without-avahi
 %endif
 
+%if ! %{with_phyp}
+%define _without_phyp --without-phyp
+%endif
+
 %if ! %{with_polkit}
 %define _without_polkit --without-polkit
 %endif
@@ -270,6 +305,10 @@ iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
 %define _without_uml --without-uml
 %endif
 
+%if ! %{with_one}
+%define _without_one --without-one
+%endif
+
 %if %{with_rhel5}
 %define _with_rhel5_api --with-rhel5-api
 %endif
@@ -298,16 +337,27 @@ iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
 %define _without_numactl --without-numactl
 %endif
 
+%if ! %{with_capng}
+%define _without_capng --without-capng
+%endif
+
+%if ! %{with_netcf}
+%define _without_netcf --without-netcf
+%endif
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
            %{?_without_lxc} \
+           %{?_without_vbox} \
            %{?_without_sasl} \
            %{?_without_avahi} \
            %{?_without_polkit} \
            %{?_without_python} \
            %{?_without_libvirtd} \
            %{?_without_uml} \
+           %{?_without_one} \
+           %{?_without_phyp} \
            %{?_without_network} \
            %{?_with_rhel5_api} \
            %{?_without_storage_fs} \
@@ -315,29 +365,27 @@ iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
            %{?_without_storage_iscsi} \
            %{?_without_storage_disk} \
            %{?_without_numactl} \
+           %{?_without_capng} \
+           %{?_without_netcf} \
+           --with-qemu-user=%{qemu_user} \
+           --with-qemu-group=%{qemu_group} \
            --with-init-script=redhat \
-           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
-           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+           --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid
 make %{?_smp_mflags}
+gzip -9 ChangeLog
 
 %install
-rm -rf %{buildroot}
+rm -fr %{buildroot}
 
 %makeinstall
 (cd docs/examples ; make clean ; rm -rf .deps 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
 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
-install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/
 
 %if %{with_qemu}
 # We don't want to install /etc/libvirt/qemu/networks in the main %files list
@@ -405,13 +453,10 @@ fi
 
 %postun -p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files
 %defattr(-, root, root)
 
-%doc AUTHORS ChangeLog NEWS README COPYING.LIB TODO
-%doc %{_mandir}/man1/virsh.1*
-%{_bindir}/virsh
-%{_libdir}/lib*.so.*
+%doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
 
 %if %{with_qemu}
@@ -431,35 +476,23 @@ fi
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
 %endif
 
-%if %{with_sasl}
-%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-%endif
-
 %if %{with_qemu}
 %dir %{_datadir}/libvirt/
 %dir %{_datadir}/libvirt/networks/
 %{_datadir}/libvirt/networks/default.xml
 %endif
 
-%dir %{_datadir}/libvirt/
-%dir %{_datadir}/libvirt/schemas/
-
-%{_datadir}/libvirt/schemas/domain.rng
-%{_datadir}/libvirt/schemas/network.rng
-%{_datadir}/libvirt/schemas/storagepool.rng
-%{_datadir}/libvirt/schemas/storagevol.rng
-%{_datadir}/libvirt/schemas/nodedev.rng
-%{_datadir}/libvirt/schemas/capability.rng
-
 %dir %{_localstatedir}/run/libvirt/
 
 %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/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/qemu/
+%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/run/libvirt/qemu/
+%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
+%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
 %endif
 %if %{with_lxc}
 %dir %{_localstatedir}/run/libvirt/lxc/
@@ -511,6 +544,31 @@ fi
 
 %doc docs/*.xml
 
+%files client -f %{name}.lang
+%defattr(-, root, root)
+%doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO
+
+%{_mandir}/man1/virsh.1*
+%{_mandir}/man1/virt-xml-validate.1*
+%{_bindir}/virsh
+%{_bindir}/virt-xml-validate
+%{_libdir}/lib*.so.*
+
+%dir %{_datadir}/libvirt/
+%dir %{_datadir}/libvirt/schemas/
+
+%{_datadir}/libvirt/schemas/domain.rng
+%{_datadir}/libvirt/schemas/network.rng
+%{_datadir}/libvirt/schemas/storagepool.rng
+%{_datadir}/libvirt/schemas/storagevol.rng
+%{_datadir}/libvirt/schemas/nodedev.rng
+%{_datadir}/libvirt/schemas/capability.rng
+%{_datadir}/libvirt/schemas/interface.rng
+
+%if %{with_sasl}
+%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
+%endif
+
 %files devel
 %defattr(-, root, root)
 
@@ -518,6 +576,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
@@ -542,6 +601,96 @@ fi
 %endif
 
 %changelog
+* Wed Jul 29 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.4.gitf055724
+- Drop explicit libselinux requires, it is autorequired
+- Drop cleanup of python/tests, apparently not needed
+- Cherry-pick upstream patch to convert NEWS to UTF-8, drop iconv
+- Drop python BR; python-devel requires it
+
+* Tue Jul 28 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.3.gitf055724
+- Enable netcf support
+- Pass --with-qemu-user=qemu etc. to configure
+- Move various requires to the libvirt-client sub-package
+- Sync some trivial cleanups from upstream spec file
+- Remove explicit libxml2 requires, again
+- Build with --without-capng if capng support is disabled
+- Remove explicit dir creating in makeinstall, replaced by attr in files
+- Set perms on /var/{run,lib,cache}/libvirt/qemu
+
+* Tue Jul 28 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.2.gitf055724
+- Drop glusterfs dep to 2.0.1 (bug #514191)
+
+* Mon Jul 27 2009 Daniel Veillard <veillard@redhat.com> - 0.7.0-0.1.gitf055724
+- prerelease of 0.7.0
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 10 2009 Richard W.M. Jones <rjones@redhat.com> - 0.6.5-2.fc12
+- Bump release number to rebuild against new libparted.
+
+* Fri Jul  3 2009 Daniel Veillard <veillard@redhat.com> - 0.6.5-1.fc12
+- Upstream release of 0.6.5
+- OpenNebula driver
+- many bug fixes
+
+* Fri Jul  3 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.4-4.fc12
+- Fix libvirtd crash with bad capabilities data (bug #505635)
+
+* Fri Jul  3 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.4-3.fc12
+- Handle shared/readonly image labelling (bug #493692)
+- Don't unnecessarily try to change a file context (bug #507555)
+- Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569)
+
+* Fri Jun  5 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.4-2.fc12
+- Remove the qemu BuildRequires
+
+* 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

sources

@@ -1 +1 @@
-3035b484861516a1cd425acef1e760e3  libvirt-0.6.2.tar.gz
+7c8008af99963682cb38666d2f1661ba  libvirt-0.7.0-0.1.gitf055724.tar.gz