Replace polkit0.patch with upstream variant

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=172
This commit is contained in:
James Fehlig 2011-11-15 23:14:03 +00:00 committed by Git OBS Bridge
parent dc6d29408a
commit 5e8fd75542
3 changed files with 29 additions and 16 deletions

28
0f590c62-polkit0.patch Normal file
View File

@ -0,0 +1,28 @@
commit 0f590c62b2af15247cafc2cc53815a7edbf5532e
Author: Jim Fehlig <jfehlig@suse.com>
Date: Tue Nov 15 15:11:49 2011 -0700
Fix build with polkit0
I missed adding libvirt_driver_remote.la to libvirtd_LDADD in
commit b8adfcc6, which didn't cause a problem in 0.9.6 but
results in this build error in 0.9.7
libvirtd-remote.o: In function `remoteDispatchAuthPolkit':
remote.c:(.text+0x188dd): undefined reference to `virNetServerGetDBusConn'
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index e8c47ae..59db217 100644
--- a/daemon/Makefile.am
+++ b/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

View File

@ -380,7 +380,7 @@ Source1: libvirtd.init
Source2: libvirtd-relocation-server.fw Source2: libvirtd-relocation-server.fw
Source99: baselibs.conf Source99: baselibs.conf
# Upstream patches # Upstream patches
Patch0: polkit0.patch Patch0: 0f590c62-polkit0.patch
# Need to go upstream # Need to go upstream
Patch100: xen-name-for-devid.patch Patch100: xen-name-for-devid.patch
Patch101: clone.patch Patch101: clone.patch

View File

@ -1,15 +0,0 @@
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