[fedora-virt-maint] rpms/libvirt/devel libvirt-convert-news-to-utf8.patch, NONE, 1.1 libvirt.spec, 1.155, 1.156

Wed Jul 29 08:09:47 UTC 2009

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14427

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-convert-news-to-utf8.patch 
Log Message:
* Wed Jul 29 2009 Mark McLoughlin <markmc at 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


libvirt-convert-news-to-utf8.patch:
 NEWS          |   70 +++++++++++++++++++++++++++++-----------------------------
 docs/news.xsl |    3 --
 2 files changed, 36 insertions(+), 37 deletions(-)

--- NEW FILE libvirt-convert-news-to-utf8.patch ---
>From 50f5a6c7ab7795fb6ade4bb24849fa2bab5084dd Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at 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 (Danie
 l 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á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



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- libvirt.spec	28 Jul 2009 18:13:09 -0000	1.155
+++ libvirt.spec	29 Jul 2009 08:09:45 -0000	1.156
@@ -76,18 +76,20 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.0
-Release: 0.3.gitf055724%{?dist}%{?extra_release}
+Release: 0.4.gitf055724%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-0.7.0-0.1.gitf055724.tar.gz
 
+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
+BuildRequires: python-devel
 
 # The client side, i.e. shared libs and virsh are in a subpackage
 Requires: libvirt-client = %{version}-%{release}
@@ -130,8 +132,6 @@ Requires: iscsi-initiator-utils
 # For disk driver
 Requires: parted
 %endif
-# For svirt support
-Requires: libselinux
 %if %{with_xen}
 BuildRequires: xen-devel
 %endif
@@ -252,10 +252,9 @@ of recent versions of Linux (and other O
 %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}
@@ -383,8 +382,6 @@ rm -fr %{buildroot}
 (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)
-(cd python/tests ; rm -f *.py?)
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
@@ -604,6 +601,12 @@ fi
 %endif
 
 %changelog
+* Wed Jul 29 2009 Mark McLoughlin <markmc at 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 at redhat.com> - 0.7.0-0.3.gitf055724
 - Enable netcf support
 - Pass --with-qemu-user=qemu etc. to configure


