From 5e8fd75542197e152204c768eb3894f148ea54a29b2ac82f7744497dede54c3c Mon Sep 17 00:00:00 2001
From: James Fehlig <jfehlig@suse.com>
Date: Tue, 15 Nov 2011 23:14:03 +0000
Subject: [PATCH] Replace polkit0.patch with upstream variant

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=172
---
 0f590c62-polkit0.patch | 28 ++++++++++++++++++++++++++++
 libvirt.spec           |  2 +-
 polkit0.patch          | 15 ---------------
 3 files changed, 29 insertions(+), 16 deletions(-)
 create mode 100644 0f590c62-polkit0.patch
 delete mode 100644 polkit0.patch

diff --git a/0f590c62-polkit0.patch b/0f590c62-polkit0.patch
new file mode 100644
index 0000000..b21a25a
--- /dev/null
+++ b/0f590c62-polkit0.patch
@@ -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
diff --git a/libvirt.spec b/libvirt.spec
index e7dab65..057c645 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -380,7 +380,7 @@ Source1:        libvirtd.init
 Source2:        libvirtd-relocation-server.fw
 Source99:       baselibs.conf
 # Upstream patches
-Patch0:         polkit0.patch
+Patch0:         0f590c62-polkit0.patch
 # Need to go upstream
 Patch100:       xen-name-for-devid.patch
 Patch101:       clone.patch
diff --git a/polkit0.patch b/polkit0.patch
deleted file mode 100644
index b1de465..0000000
--- a/polkit0.patch
+++ /dev/null
@@ -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