Bug fix for 249594, daniel

.cvsignore

@@ -1,6 +1,19 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.gz
-libvirt-0.4.6.tar.gz
+libvirt-0.0.3.tar.gz
+libvirt-0.0.4.tar.gz
+libvirt-0.0.5.tar.gz
+libvirt-0.0.6.tar.gz
+libvirt-0.1.0.tar.gz
+libvirt-0.1.2.tar.gz
+libvirt-0.1.1.tar.gz
+libvirt-0.1.3.tar.gz
+libvirt-0.1.4.tar.gz
+libvirt-0.1.5.tar.gz
+libvirt-0.1.6.tar.gz
+libvirt-0.1.7.tar.gz
+libvirt-0.1.8.tar.gz
+libvirt-0.1.9.tar.gz
+libvirt-0.1.10.tar.gz
+libvirt-0.1.11.tar.gz
+libvirt-0.2.0.tar.gz
+libvirt-0.2.1.tar.gz
+libvirt-0.2.2.tar.gz

Makefile

@@ -3,19 +3,4 @@
 NAME := libvirt
 SPECFILE = $(firstword $(wildcard *.spec))
 
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
+include ../common/Makefile.common

branch

@@ -0,0 +1 @@
+F-7

libvirt-qemu.patch

@@ -0,0 +1,14 @@
+diff -rup libvirt-0.3.1.orig/src/qemu_conf.c libvirt-0.3.1.new/src/qemu_conf.c
+--- libvirt-0.3.1.orig/src/qemu_conf.c	2007-07-24 11:06:38.000000000 -0400
++++ libvirt-0.3.1.new/src/qemu_conf.c	2007-07-26 10:22:09.000000000 -0400
+@@ -1088,6 +1088,10 @@ static struct qemud_vm_def *qemudParseXM
+     if ((obj == NULL) || (obj->type != XPATH_STRING) ||
+         (obj->stringval == NULL) || (obj->stringval[0] == 0)) {
+         const char *defaultMachine = qemudDefaultMachineForArch(def->os.arch);
++        if (!defaultMachine) {
++            qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "unsupported arch %s", def->os.arch);
++            goto error;
++        }
+         if (strlen(defaultMachine) >= (QEMUD_OS_MACHINE_MAX_LEN-1)) {
+             qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", "machine type too long");
+             goto error;

libvirt.spec

@@ -1,45 +1,13 @@
 # -*- 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}
-
-# Xen is available only on i386 x86_64 ia64
-%ifnarch i386 i686 x86_64 ia64
-%define with_xen 0
-%endif
-
-%if ! %{with_xen}
-%define with_xen_proxy 0
-%endif
-
-%if "%{fedora}"
-%ifarch ppc64
-%define with_qemu 0
-%endif
-%endif
-
-%if 0%{?fedora} >= 8
-%define with_polkit    0%{!?_without_polkit:1}
-%define with_xen_proxy 0
-%endif
-
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.6
-Release: 3%{?dist}%{?extra_release}
-License: LGPLv2+
+Version: 0.3.1
+Release: 2%{?dist}%{?extra_release}
+License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-Patch0: python_make.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
 Requires: libxml2
@@ -48,86 +16,18 @@ Requires: ncurses
 Requires: dnsmasq
 Requires: bridge-utils
 Requires: iptables
-# 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
-# For mount/umount in FS driver
-BuildRequires: util-linux
-# For showmount in FS driver (netfs discovery)
-BuildRequires: nfs-utils
-Requires: nfs-utils
-%if %{with_qemu}
-# From QEMU RPMs
-Requires: /usr/bin/qemu-img
-%else
-%if %{with_xen}
-# From Xen RPMs
-Requires: /usr/sbin/qcow-create
-%endif
-%endif
-# For LVM drivers
-Requires: lvm2
-# For ISCSI driver
-Requires: iscsi-initiator-utils
-# For disk driver
-Requires: parted
-%if %{with_xen}
 BuildRequires: xen-devel
-%endif
 BuildRequires: libxml2-devel
-BuildRequires: xhtml1-dtds
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: gnutls-devel
-%if %{with_avahi}
-BuildRequires: avahi-devel
-%endif
-BuildRequires: libselinux-devel
-BuildRequires: dnsmasq
-BuildRequires: bridge-utils
-%if %{with_qemu}
-BuildRequires: qemu
-%endif
-%if %{with_sasl}
-BuildRequires: cyrus-sasl-devel
-%endif
-%if %{with_polkit}
-BuildRequires: PolicyKit-devel >= 0.6
-%endif
-# For mount/umount in FS driver
-BuildRequires: util-linux
-%if %{with_qemu}
-# From QEMU RPMs
-BuildRequires: /usr/bin/qemu-img
-%else
-%if %{with_xen}
-# From Xen RPMs
-BuildRequires: /usr/sbin/qcow-create
-%endif
-%endif
-# For LVM drivers
-BuildRequires: lvm2
-# For ISCSI driver
-BuildRequires: iscsi-initiator-utils
-# For disk driver
-BuildRequires: parted-devel
 Obsoletes: libvir
-
-# Fedora build root suckage
-BuildRequires: gawk
+ExclusiveArch: i386 x86_64 ia64
+Patch0: libvirt-qemu.patch
 
 %description
-Libvirt is a C toolkit to interact with the virtualization capabilities
+Libvirt is a C toolkit to interract with the virtualization capabilities
 of recent versions of Linux (and other OSes).
 
 %package devel
@@ -135,16 +35,12 @@ Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
 Requires: libvirt = %{version}
 Requires: pkgconfig
-%if %{with_xen}
-Requires: xen-devel
-%endif
 Obsoletes: libvir-devel
 
 %description devel
 Includes and documentations for the C library providing an API to use
 the virtualization capabilities of recent versions of Linux (and other OSes).
 
-%if %{with_python}
 %package python
 Summary: Python bindings for the libvirt library
 Group: Development/Libraries
@@ -154,64 +50,16 @@ Obsoletes: libvir-python
 %description python
 The libvirt-python package contains a module that permits applications
 written in the Python programming language to use the interface
-supplied by the libvirt library to use the virtualization capabilities
+supplied by the libvirt library to use the the virtualization capabilities 
 of recent versions of Linux (and other OSes).
-%endif
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 
 %build
-%if ! %{with_xen}
-%define _without_xen --without-xen
-%endif
-
-%if ! %{with_qemu}
-%define _without_qemu --without-qemu
-%endif
-
-%if ! %{with_openvz}
-%define _without_openvz --without-openvz
-%endif
-
-%if ! %{with_lxc}
-%define _without_lxc --without-lxc
-%endif
-
-%if ! %{with_sasl}
-%define _without_sasl --without-sasl
-%endif
-
-%if ! %{with_avahi}
-%define _without_avahi --without-avahi
-%endif
-
-%if ! %{with_polkit}
-%define _without_polkit --without-polkit
-%endif
-
-%if ! %{with_python}
-%define _without_python --without-python
-%endif
-
-%if ! %{with_libvirtd}
-%define _without_libvirtd --without-libvirtd
-%endif
-
-%configure %{?_without_xen} \
-           %{?_without_qemu} \
-           %{?_without_openvz} \
-           %{?_without_lxc} \
-           %{?_without_sasl} \
-           %{?_without_avahi} \
-           %{?_without_polkit} \
-           %{?_without_python} \
-           %{?_without_libvirtd} \
-           --with-init-script=redhat \
-           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
-           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
-make %{?_smp_mflags}
+%configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+make
 
 %install
 rm -fr %{buildroot}
@@ -224,12 +72,7 @@ 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
 # because if the admin wants to delete the default network completely, we don't
 # want to end up re-incarnating it on every RPM upgrade.
@@ -240,30 +83,14 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 # Strip auto-generated UUID - we need it generated per-install
 sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
-%else
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
-rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug
-rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
-%endif
 %find_lang %{name}
 
-%if ! %{with_python}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}
-%endif
-
-%if ! %{with_qemu}
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
-%endif
-
 %clean
 rm -fr %{buildroot}
 
 %post
 /sbin/ldconfig
 
-%if %{with_libvirtd}
-%if %{with_qemu}
 # We want to install the default network for initial RPM installs
 # or on the first upgrade from a non-network aware libvirt only.
 # We check this by looking to see if the daemon is already installed
@@ -276,18 +103,14 @@ then
          > %{_sysconfdir}/libvirt/qemu/networks/default.xml
     ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 fi
-%endif
 
 /sbin/chkconfig --add libvirtd
-%endif
 
 %preun
-%if %{with_libvirtd}
 if [ $1 = 0 ]; then
     /sbin/service libvirtd stop 1>/dev/null 2>&1
     /sbin/chkconfig --del libvirtd
 fi
-%endif
 
 %postun
 /sbin/ldconfig
@@ -300,71 +123,21 @@ fi
 %{_bindir}/virsh
 %{_libdir}/lib*.so.*
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
-
-%if %{with_qemu}
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
-%endif
-
-%if %{with_libvirtd}
 %{_sysconfdir}/rc.d/init.d/libvirtd
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
-%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
-%endif
-
-%if %{with_qemu}
-%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 %{_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/
-
-%if %{with_qemu}
-%{_datadir}/augeas/lenses/libvirtd_qemu.aug
-%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
-%endif
-
-%if %{with_libvirtd}
-%{_datadir}/augeas/lenses/libvirtd.aug
-%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
-%endif
-
-%if %{with_polkit}
-%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
-%endif
-
-%if %{with_qemu}
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
-%endif
-
-%if %{with_xen_proxy}
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
-%endif
-
-%if %{with_lxc}
-%attr(0755, root, root) %{_libexecdir}/libvirt_lxc
-%endif
-
-%if %{with_libvirtd}
-%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
 %attr(0755, root, root) %{_sbindir}/libvirtd
-%endif
-
-%doc docs/*.rng
-%doc docs/*.xml
+%doc docs/libvirt.rng
+%doc docs/network.rng
 
 %files devel
 %defattr(-, root, root)
@@ -382,7 +155,6 @@ fi
 %doc docs/examples
 %doc docs/libvirt-api.xml
 
-%if %{with_python}
 %files python
 %defattr(-, root, root)
 
@@ -393,160 +165,26 @@ fi
 %doc python/TODO
 %doc python/libvirtclass.txt
 %doc docs/examples/python
-%endif
 
 %changelog
-* Wed Sep 24 2008 Daniel Veillard <veillard@redhat.com> - 0.4.6-3.fc10
-- apply the python makefile patch for #463733
-
-* Wed Sep 24 2008 Daniel Veillard <veillard@redhat.com> - 0.4.6-2.fc10
-- upstream release 0.4.6
-- fixes some problems with 0.4.5
-
-* Tue Sep  9 2008 Daniel Veillard <veillard@redhat.com> - 0.4.5-2.fc10
-- fix a crash if a QEmu/KVM domain is defined without an emulator path
-
-* Mon Sep  8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.5-1.fc10
-- upstream release 0.4.5
-- a lot of bug fixes
-- major updates to QEmu/KVM and Linux containers drivers
-- support for OpenVZ if installed
-
-* Thu Aug  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.4.4-3.fc10
-- fix license tag
-
-* Tue Jul  8 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.4-2.fc10
-- Fix booting of CDROM images with KVM (rhbz #452355)
-
-* Wed Jun 25 2008 Daniel Veillard <veillard@redhat.com> - 0.4.4-1.fc10
-- upstream release 0.4.4
-- fix a few bugs in previous release
-
-* Thu Jun 12 2008 Daniel Veillard <veillard@redhat.com> - 0.4.3-1.fc10
-- upstream release 0.4.3
-- many bug fixes
-- many small improvements
-- serious xenner fixes
-
-* Wed Jun  4 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-6.fc10
-- Disable lokkit support again (#449996, #447633)
-- Ensure %{fedora} is evaluated correctly
-
-* Thu May 15 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-5.fc10
-- Rebuild with policy enabled (rhbz #446616)
-
-* Fri May  9 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-4.fc10
-- Added directory for initrd/kernel images for SELinux policy
-
-* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-3.fc10
-- Simplify the way arch conditionals are handled
-
-* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-2.fc10
-- Enable lokkit support (#443796)
-
-* Tue Apr  8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.2-1.fc9
-- upstream release 0.4.2
-- many bug fixes
-- localization updates
-
-* Thu Apr  4 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-7.fc9
-- Don't run polkit-auth as root
-- Don't request polkit auth if client is root
-
-* Fri Mar 28 2008 Chris Lalancette <clalance@redhat.com> - 0.4.1-6.fc9
-- When dumping XML for a storage pool, make the <source> directory tag
-  match the <dir> tag used for specifying the pool in the first place
-
-* Thu Mar 27 2008 Chris Lalancette <clalance@redhat.com> - 0.4.1-5.fc9
-- Do iscsiadm sendtarget before trying to do login
-- Do sysfs scanning for iSCSI LUNs instead of trying to parse them from
-  iscsiadm session output
-
-* Thu Mar 13 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-4.fc9
-- Fix QEMU tap device setup
-- Fix Xen boot device XML processing
-- Fixed QEMU cdrom media change
-
-* Mon Mar 10 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-3.fc9
-- Fixed daemon startup when run with --daemon flag
-
-* Mon Mar  3 2008 Daniel Veillard <veillard@redhat.com> - 0.4.1-2.fc9
-- 2 patches found just after the release
-
-* Mon Mar  3 2008 Daniel Veillard <veillard@redhat.com> - 0.4.1-1.fc9
-- Release of 0.4.1
-- Storage APIs
-- xenner support
-- lots of assorted improvements, bugfixes and cleanups
-- documentation and localization improvements
-
-* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.4.0-5
-- Autorebuild for GCC 4.3
-
-* Fri Jan 18 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-4.fc9
-- Fix SSH tunnelling (rhbz #428743)
-- Fix back-compat for nodeinfo call changes.
-
-* Sun Jan 13 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-3.fc9
-- Fix crash when no auth callback
-
-* Wed Jan  2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-2.fc9
-- Fix reading large config files (rhbz #426425)
-- Fix crash when connecting to a PolicyKit enabled server with not auth callback (rhbz #427107)
-
-* Tue Dec 18 2007 Daniel Veillard <veillard@redhat.com> - 0.4.0-1.fc8
-- Release of 0.4.0
-- SASL based authentication
-- PolicyKit authentication
-- improved NUMA and statistics support
-- lots of assorted improvements, bugfixes and cleanups
-- documentation and localization improvements
-
-* Mon Oct 15 2007 Daniel P. Berrange <berrange@redhat.com> - 0.3.3-2.fc8
-- Added QEMU driver config file support
-- Added example config files
-
-* Sun Sep 30 2007 Daniel Veillard <veillard@redhat.com> - 0.3.3-1
-- Release of 0.3.3
-- Avahi support
-- NUMA support
-- lots of assorted improvements, bugfixes and cleanups
-- documentation and localization improvements
-
-* Fri Aug 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.2-2.fc8
-- also build on arches where Xen is not available
-
-* Tue Aug 21 2007 Daniel Veillard <veillard@redhat.com> - 0.3.2-1.fc8
-- Release of 0.3.2
-- API for domains migration
-- APIs for collecting statistics on disks and interfaces
-- lots of assorted bugfixes and cleanups
-- documentation and localization improvements
-
-* Thu Aug 16 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-4.fc8
-- Fixes missing Requires for libvirt-devel
-
-* Thu Jul 26 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-3.fc8
+* Thu Jul 26 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-2.fc7
 - adds fix for bug #249594
 
-* Wed Jul 25 2007 Jesse Keating <jkeating@redhat.com> - 0.3.1-2
-- Rebuild for RH #249435
-
-* Tue Jul 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-1.fc8
+* Tue Jul 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-1.fc7
 - Release of 0.3.1
 - localtime clock support
 - PS/2 and USB input devices
 - lots of assorted bugfixes and cleanups
 - documentation and localization improvements
 
-* Mon Jul  9 2007 Daniel Veillard <veillard@redhat.com> - 0.3.0-1.fc8
+* Mon Jul  9 2007 Daniel Veillard <veillard@redhat.com> - 0.3.0-1.fc7
 - Release of 0.3.0
 - Secure remote access support
 - unification of daemons
 - lots of assorted bugfixes and cleanups
 - documentation and localization improvements
 
-* Fri Jun  8 2007 Daniel Veillard <veillard@redhat.com> - 0.2.3-1.fc8
+* Fri Jun  8 2007 Daniel Veillard <veillard@redhat.com> - 0.2.3-1.fc7
 - Release of 0.2.3
 - lot of assorted bugfixes and cleanups
 - support for Xen-3.1

python_make.patch

@@ -1,35 +0,0 @@
-Index: python/Makefile.am
-===================================================================
-RCS file: /data/cvs/libxen/python/Makefile.am,v
-retrieving revision 1.13
-diff -u -p -r1.13 Makefile.am
---- python/Makefile.am	5 Feb 2008 19:27:37 -0000	1.13
-+++ python/Makefile.am	24 Sep 2008 13:21:06 -0000
-@@ -50,7 +50,7 @@ GENERATED= libvirt-export.c \
- $(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
- 	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
- 
--libvirt.py: $(srcdir)/libvir.py libvirtclass.py
-+libvirt.py: $(srcdir)/libvir.py $(GENERATED)
- 	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
- 	mv $@-t $@
- 
-*** python/Makefile.in.orig	2008-09-24 15:19:20.000000000 +0200
---- python/Makefile.in	2008-09-24 15:20:07.000000000 +0200
-*************** uninstall-am: uninstall-local uninstall-
-*** 1027,1033 ****
-  @WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
-  @WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
-  
-! @WITH_PYTHON_TRUE@libvirt.py: $(srcdir)/libvir.py libvirtclass.py
-  @WITH_PYTHON_TRUE@	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
-  @WITH_PYTHON_TRUE@	mv $@-t $@
-  
---- 1027,1033 ----
-  @WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
-  @WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
-  
-! @WITH_PYTHON_TRUE@libvirt.py: $(srcdir)/libvir.py $(GENERATED)
-  @WITH_PYTHON_TRUE@	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
-  @WITH_PYTHON_TRUE@	mv $@-t $@
-  

sources

@@ -1 +1 @@
-abdf727deaffd868172f7243eb75ffe3  libvirt-0.4.6.tar.gz
+9b8a2a917dbaa028dff9d7bb03ca36ae  libvirt-0.3.1.tar.gz