diff --git a/libvirt-0.9.6-specfile-fix-typo-in-chkconfig-commandline.patch b/libvirt-0.9.6-specfile-fix-typo-in-chkconfig-commandline.patch new file mode 100644 index 0000000..b8a69a8 --- /dev/null +++ b/libvirt-0.9.6-specfile-fix-typo-in-chkconfig-commandline.patch @@ -0,0 +1,40 @@ +From b221be79d0682b12249cb4b408e1b649cb2bc974 Mon Sep 17 00:00:00 2001 +From: Laine Stump +Date: Mon, 12 Mar 2012 14:03:38 -0400 +Subject: [PATCH] specfile: fix typo in chkconfig commandline + +This addresses https://bugzilla.redhat.com/show_bug.cgi?id=786890 in +the simplest manner possible. + +The problem is that the chkconfig command is being called with +"--levels", but the option name is actually "--level". + +Upstream libvirt has completely removed the offending code, but the +patch that does that is more invasive than this patch, which simply +corrects the misspelling. + +Note that this change really needs to be in the Fedora-git +libvirt.spec file, *not* the specfile in the source RPM. This patch to +the src.rpm copy is included purely to prevent potential regression in +the event someone regenerates Fedora's libvirt.spec from sources. +--- + libvirt.spec.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libvirt.spec.in b/libvirt.spec.in +index 8579ba8..4b311b7 100644 +--- a/libvirt.spec.in ++++ b/libvirt.spec.in +@@ -947,7 +947,7 @@ fi + /sbin/chkconfig --add libvirt-guests + if [ $1 -ge 1 ]; then + level=$(/sbin/runlevel | /bin/cut -d ' ' -f 2) +- if /sbin/chkconfig --levels $level libvirt-guests; then ++ if /sbin/chkconfig --level $level libvirt-guests; then + # this doesn't do anything but allowing for libvirt-guests to be + # stopped on the first shutdown + /sbin/service libvirt-guests start > /dev/null 2>&1 || true +-- +1.7.7.6 + + diff --git a/libvirt.spec b/libvirt.spec index 415b92c..f2b5742 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -243,7 +243,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 0.9.6 -Release: 5%{?dist}%{?extra_release} +Release: 6%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz @@ -274,6 +274,8 @@ Patch20: %{name}-no-init-hal-start.patch Patch21: %{name}-empty-lvm-hang.patch # Fix test failures with new gnutls Patch22: %{name}-gnutls-test-failures.patch +# Fix typo in chkconfig commandline for specfile +Patch23: %{name}-%{version}-specfile-fix-typo-in-chkconfig-commandline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ @@ -616,6 +618,7 @@ of recent versions of Linux (and other OSes). %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 %build %if ! %{with_xen} @@ -1005,7 +1008,7 @@ fi /sbin/chkconfig --add libvirt-guests if [ $1 -ge 1 ]; then level=$(/sbin/runlevel | /bin/cut -d ' ' -f 2) - if /sbin/chkconfig --levels $level libvirt-guests; then + if /sbin/chkconfig --level $level libvirt-guests; then # this doesn't do anything but allowing for libvirt-guests to be # stopped on the first shutdown /sbin/service libvirt-guests start > /dev/null 2>&1 || true @@ -1224,6 +1227,9 @@ fi %endif %changelog +* Fri Mar 30 2012 Osier Yang - 0.9.6-6 +- fix typo in chkconfig commandline for specfile - Bug 786890 + * Sun Mar 04 2012 Cole Robinson - 0.9.6-5 - Fix crash when migrating many guests with vdsm (bz 785789) - Fix libvirtd hang in vmware guest (bz 796451)