Couple of tiny changes in this patch which were necessary to complete the Fedora Merge Review. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v
Index: libvirt-0.6.0-init.patch =================================================================== RCS file: libvirt-0.6.0-init.patch diff -N libvirt-0.6.0-init.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libvirt-0.6.0-init.patch 11 Feb 2009 17:31:06 -0000 @@ -0,0 +1,19 @@ +--- libvirt-0.6.0/qemud/libvirtd.init.in 2008-06-11 14:02:12.000000000 +0100 ++++ libvirt-0.6.0.libvirtd/qemud/libvirtd.init.in 2009-02-11 16:51:33.000000000 +0000 +@@ -6,7 +6,6 @@ + ### BEGIN INIT INFO + # Provides: libvirtd + # Should-Start: xend +-# Default-Start: 3 4 5 + # Short-Description: daemon for libvirt virtualization API + # Description: This is a daemon for managing guest instances + # and libvirt virtual networks +@@ -17,7 +16,7 @@ + # + # libvirtd: guest and virtual network management daemon + # +-# chkconfig: 345 97 03 ++# chkconfig: - 97 03 + # description: This is a daemon for managing guest instances + # and libvirt virtual networks + # See http://libvirt.org Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.109 diff -u -r1.109 libvirt.spec --- libvirt.spec 6 Feb 2009 19:28:20 -0000 1.109 +++ libvirt.spec 11 Feb 2009 17:31:06 -0000 @@ -47,16 +47,16 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz Patch1: %{name}-%{version}-timeout.patch Patch2: %{name}-%{version}-rpccall.patch +Patch3: %{name}-%{version}-init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel -Requires: libxml2 Requires: readline Requires: ncurses Requires: dnsmasq @@ -140,7 +140,8 @@ BuildRequires: parted-devel # For QEMU/LXC numa info BuildRequires: numactl-devel -Obsoletes: libvir +Obsoletes: libvir <= 0.2 +Provides: libvir = %{version}-%{release} # Fedora build root suckage BuildRequires: gawk @@ -152,12 +153,13 @@ %package devel Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries -Requires: libvirt = %{version} +Requires: libvirt = %{version}-%{release} Requires: pkgconfig %if %{with_xen} Requires: xen-devel %endif -Obsoletes: libvir-devel +Obsoletes: libvir-devel <= 0.2 +Provides: libvir-devel = %{version}-%{release} %description devel Includes and documentations for the C library providing an API to use @@ -167,8 +169,9 @@ %package python Summary: Python bindings for the libvirt library Group: Development/Libraries -Requires: libvirt = %{version} -Obsoletes: libvir-python +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 @@ -181,6 +184,10 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 + +mv NEWS NEWS.old +iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS %build %if ! %{with_xen} @@ -249,7 +256,7 @@ make %{?_smp_mflags} %install -rm -fr %{buildroot} +rm -rf %{buildroot} %makeinstall (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) @@ -291,6 +298,10 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf %endif +%if %{with_libvirtd} +chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd +%endif + %clean rm -fr %{buildroot} @@ -324,8 +335,7 @@ fi %endif -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-, root, root) @@ -463,6 +473,9 @@ %endif %changelog +* Wed Feb 11 2009 Richard W.M. Jones <rjones@xxxxxxxxxx> - 0.6.0-3.fc11 +- Multiple fixes to remove rpmlint warnings/errors (rhbz #226055) + * Fri Feb 6 2009 Daniel P. Berrange <berrange@xxxxxxxxxx> - 0.6.0-2.fc11 - Fix libvirtd --timeout usage - Fix RPC call problems and QEMU startup handling (rhbz #484414) @@ -531,7 +544,7 @@ * Wed Jun 4 2008 Mark McLoughlin <markmc@xxxxxxxxxx> - 0.4.2-6.fc10 - Disable lokkit support again (#449996, #447633) -- Ensure %{fedora} is evaluated correctly +- Ensure %-fedora is evaluated correctly * Thu May 15 2008 Daniel P. Berrange <berrange@xxxxxxxxxx> - 0.4.2-5.fc10 - Rebuild with policy enabled (rhbz #446616) @@ -716,7 +729,7 @@ - it's pkgconfig not pgkconfig ! * Mon Nov 6 2006 Daniel Veillard <veillard@xxxxxxxxxx> 0.1.8-2 -- fixing spec file, added %dist, -devel requires pkgconfig and xen-devel +- fixing spec file, added %-dist, -devel requires pkgconfig and xen-devel - Resolves: rhbz#202320 * Mon Oct 16 2006 Daniel Veillard <veillard@xxxxxxxxxx> 0.1.8-1
-- Libvir-list mailing list Libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list