rpms/PolicyKit-gnome/devel PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch, NONE, 1.1 PolicyKit-gnome.spec, 1.28, 1.29

[Daniel Williams]

Author: dcbw

Update of /cvs/pkgs/rpms/PolicyKit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21531

Modified Files:
	PolicyKit-gnome.spec 
Added Files:
	PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch 
Log Message:
* Thu Aug 13 2009 Dan Williams <dcbw at redhat.com> - 0.9.2-5
- Workaround for dbus-glib duplicate object path registrations (fdo #23297)



PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch:
 polkit-gnome-auth.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch ---
diff -up PolicyKit-gnome-0.9.2/polkit-gnome/polkit-gnome-auth.c.foo PolicyKit-gnome-0.9.2/polkit-gnome/polkit-gnome-auth.c
--- PolicyKit-gnome-0.9.2/polkit-gnome/polkit-gnome-auth.c.foo	2009-08-13 18:28:06.942432221 -0500
+++ PolicyKit-gnome-0.9.2/polkit-gnome/polkit-gnome-auth.c	2009-08-13 18:28:45.469307352 -0500
@@ -140,7 +140,7 @@ polkit_gnome_auth_obtain (PolKitAction *
 
 	polkit_gnome_proxy = dbus_g_proxy_new_for_name (session_bus,
                                                         "org.freedesktop.PolicyKit.AuthenticationAgent", /* bus name */
-                                                        "/",                                             /* object */
+                                                        "/org/gnome/PolicyKit/Manager",                  /* object */
                                                         "org.freedesktop.PolicyKit.AuthenticationAgent");/* interface */
 
         c = g_new0 (CallClosure, 1);


Index: PolicyKit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/PolicyKit-gnome.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- PolicyKit-gnome.spec	24 Jul 2009 15:45:49 -0000	1.28
+++ PolicyKit-gnome.spec	14 Aug 2009 14:23:21 -0000	1.29
@@ -10,7 +10,7 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: PolicyKit-gnome
 Version: 0.9.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 URL: http://svn.gnome.org/viewvc/policykit-gnome/trunk
@@ -35,6 +35,10 @@ Requires(preun): GConf2 >= 2.14
 
 Patch0: PolicyKit-gnome-0.9.2-dont-spawn-when-running-under-gdm.patch
 Patch1: PolicyKit-gnome-0.9.2-fix-clickable-buttons.patch
+# fdo #23297: dbus-glib 0.82 stopped allowing duplicate object path
+# registrations, which should get fixed in dbus-glib; until then work around
+# it by using the preferred polkit-gnome-manager object path
+Patch2: PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch
 
 # This can be used by apps which want to use the PolicyKit
 # frontend implementation of the desktop they are running under
@@ -83,6 +87,7 @@ PolicyKit-gnome.
 %setup -q
 %patch0 -p0 -b .no-spawning-under-gdm
 %patch1 -p0 -b .fix-clickable-buttons
+%patch2 -p1 -b .fix-manager-path
 
 %build
 %configure
@@ -155,6 +160,9 @@ fi
 %{_datadir}/PolicyKit/policy/*.policy
 
 %changelog
+* Thu Aug 13 2009 Dan Williams <dcbw at redhat.com> - 0.9.2-5
+- Workaround for dbus-glib duplicate object path registrations (fdo #23297)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild