From 71733e93286fc6a1418076c2cc54e8c22f60ec23 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Sat, 31 Mar 2012 12:33:27 +0100 Subject: [PATCH] Remove previous non-upstream patch which did not fix bug 802475 --- libvirt-0.9.10-systemd-network.patch | 11 ----------- libvirt.spec | 7 ++++--- 2 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 libvirt-0.9.10-systemd-network.patch diff --git a/libvirt-0.9.10-systemd-network.patch b/libvirt-0.9.10-systemd-network.patch deleted file mode 100644 index e1f663e..0000000 --- a/libvirt-0.9.10-systemd-network.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur libvirt-0.9.10.orig/daemon/libvirtd.service.in libvirt-0.9.10/daemon/libvirtd.service.in ---- libvirt-0.9.10.orig/daemon/libvirtd.service.in 2012-02-03 01:51:54.000000000 -0700 -+++ libvirt-0.9.10/daemon/libvirtd.service.in 2012-03-28 22:34:34.576986925 -0600 -@@ -9,6 +9,7 @@ - After=udev.target - After=avahi.target - After=dbus.target -+After=network.target - Before=libvirt-guests.service - - [Service] diff --git a/libvirt.spec b/libvirt.spec index 7dbb70f..d6f3a6a 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -252,12 +252,11 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 0.9.10 -Release: 2%{?dist}%{?extra_release}.1 +Release: 3%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz Patch1: %{name}-%{version}-qemu-replace-deprecated-fedora-13-machine.patch -Patch2: libvirt-0.9.10-systemd-network.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ @@ -589,7 +588,6 @@ of recent versions of Linux (and other OSes). %prep %setup -q %patch1 -p1 -%patch2 -p1 %build %if ! %{with_xen} @@ -1279,6 +1277,9 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %endif %changelog +* Sat Mar 31 2012 Daniel P. Berrange - 0.9.10-3 +- Remove previous non-upstream patch which did not fix bug 802475 + * Wed Mar 28 2012 Kevin Fenzi - 0.9.10-2.1 - Add patch to fix ordering to come up after network target. Bug 802475