Fix config file loading

Daniel

.cvsignore

@@ -12,3 +12,6 @@ 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.spec

@@ -2,8 +2,8 @@
 
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
-Version: 0.1.9
-Release: 1%{?dist}
+Version: 0.2.0
+Release: 4%{?dist}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -19,8 +19,23 @@ BuildRequires: libxml2-devel
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
+BuildRequires: libsysfs-devel
+BuildRequires: gnutls-devel
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64 ia64
+Patch0: libvirt-0.2.0-Werror.patch
+Patch2: libvirt-0.2.0-qemu-fixes.patch
+# The 0.9.0 build of QEMU in Fedora has compiled out
+# the normal KQEMU support, so we drop that from libvirt
+# too, otherwise we fail on the unknown -no-kqemu command
+# line arg to qemu
+Patch3: libvirt-0.2.0-disable-kqemu.patch
+
+# QEMU 0.9.0 wants a : in front of the port number now :-(
+Patch4: libvirt-0.2.0-vnc-port.patch
+
+# Fix loading of network & guest configs
+Patch5: libvirt-0.2.0-config-load.patch
 
 %description
 This C library provides an API to use the Xen virtualization framework,
@@ -30,7 +45,6 @@ and the virsh command line tool to control virtual domains.
 Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
 Requires: libvirt = %{version}
-Requires: xen-devel
 Requires: pkgconfig
 Obsoletes: libvir-devel
 
@@ -43,7 +57,6 @@ Summary: Python bindings for the libvirt library
 Group: Development/Libraries
 Requires: libvirt = %{version}
 Obsoletes: libvir-python
-Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`)
 
 %description python
 The libvirt-python package contains a module that permits applications
@@ -52,6 +65,11 @@ supplied by the libvirt library to use the Xen virtualization framework.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %configure
@@ -66,6 +84,8 @@ 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%{_sysconfdir}/libvirt/qemu/networks/
+install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/
 %find_lang %{name}
 
 %clean
@@ -84,7 +104,11 @@ rm -fr %{buildroot}
 %doc %{_mandir}/man1/virsh.1*
 %{_bindir}/virsh
 %{_libdir}/lib*.so.*
+%config %{_sysconfdir}/libvirt/qemu/networks/
+%{_localstatedir}/run/libvirt/
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
+%attr(0755, root, root) %{_libexecdir}/libvirt_qemud
+%doc docs/libvirt.rng
 
 %files devel
 %defattr(-, root, root)
@@ -113,6 +137,37 @@ rm -fr %{buildroot}
 %doc docs/examples/python
 
 %changelog
+* Fri Feb 23 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-4.fc7
+- Fix loading of guest & network configs
+
+* Fri Feb 16 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-3.fc7
+- Disable kqemu support since its not in Fedora qemu binary
+- Fix for -vnc arg syntax change in 0.9.0  QEMU
+
+* Thu Feb 15 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-2.fc7
+- Fixed path to qemu daemon for autostart
+- Fixed generation of <features> block in XML
+- Pre-create config directory at startup
+
+* Wed Feb 14 2007 Daniel Veillard <veillard@redhat.com> 0.2.0-1.fc7
+- support for KVM and QEmu
+- support for network configuration
+- assorted fixes
+
+* Mon Jan 22 2007 Daniel Veillard <veillard@redhat.com> 0.1.11-1.fc7
+- finish inactive Xen domains support
+- memory leak fix
+- RelaxNG schemas for XML configs
+
+* Wed Dec 20 2006 Daniel Veillard <veillard@redhat.com> 0.1.10-1.fc7
+- support for inactive Xen domains
+- improved support for Xen display and vnc
+- a few bug fixes
+- localization updates
+
+* Thu Dec  7 2006 Jeremy Katz <katzj@redhat.com> - 0.1.9-2
+- rebuild against python 2.5
+
 * Wed Nov 29 2006 Daniel Veillard <veillard@redhat.com> 0.1.9-1
 - better error reporting
 - python bindings fixes and extensions

sources

@@ -1 +1 @@
-f40d95ab973813a6a6588c6f828c7ed1  libvirt-0.1.9.tar.gz
+65dd1d2da9bfb304a4e4a69b058cda9f  libvirt-0.2.0.tar.gz