From dc6d29408a36f676e1cbace304602276c8e2b20173ef4c1a36f7c49b4e3dac89 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 15 Nov 2011 22:06:40 +0000 Subject: [PATCH] Fix build when using older PolicyKit OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=171 --- libvirt.changes | 6 ++++++ libvirt.spec | 2 ++ polkit0.patch | 15 +++++++++++++++ use-init-script-redhat.patch | 2 +- 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 polkit0.patch diff --git a/libvirt.changes b/libvirt.changes index d8104df..f179c2d 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 15 15:05:36 MST 2011 - jfehlig@suse.com + +- Fix build when using older PolicyKit + polkit0.patch + ------------------------------------------------------------------- Wed Nov 9 18:52:18 MST 2011 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 2b06642..e7dab65 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -380,6 +380,7 @@ Source1: libvirtd.init Source2: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches +Patch0: polkit0.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: clone.patch @@ -502,6 +503,7 @@ Authors: %prep %setup -q +%patch0 -p1 %patch100 -p1 %patch101 %patch102 -p1 diff --git a/polkit0.patch b/polkit0.patch new file mode 100644 index 0000000..b1de465 --- /dev/null +++ b/polkit0.patch @@ -0,0 +1,15 @@ +Index: libvirt-0.9.7/daemon/Makefile.am +=================================================================== +--- libvirt-0.9.7.orig/daemon/Makefile.am ++++ libvirt-0.9.7/daemon/Makefile.am +@@ -156,6 +156,10 @@ endif + if WITH_NWFILTER + libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la + endif ++ ++if HAVE_POLKIT0 ++libvirtd_LDADD += ../src/libvirt_driver_remote.la ++endif + endif + + libvirtd_LDADD += ../src/libvirt.la diff --git a/use-init-script-redhat.patch b/use-init-script-redhat.patch index 04ae33c..3886ea5 100644 --- a/use-init-script-redhat.patch +++ b/use-init-script-redhat.patch @@ -230,7 +230,7 @@ Index: libvirt-0.9.7/daemon/Makefile.am =================================================================== --- libvirt-0.9.7.orig/daemon/Makefile.am +++ libvirt-0.9.7/daemon/Makefile.am -@@ -236,20 +236,12 @@ install-logrotate: $(LOGROTATE_CONFS) +@@ -240,20 +240,12 @@ install-logrotate: $(LOGROTATE_CONFS) if LIBVIRT_INIT_SCRIPT_RED_HAT install-init: libvirtd.init