rpms/gnome-session/devel gnome-session.spec, 1.234, 1.235 polkit1.patch, 1.1, 1.2

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gnome-session.spec polkit1.patch 
Log Message:
fix some problems with the PolicyKit port



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- gnome-session.spec	10 Jun 2009 05:16:38 -0000	1.234
+++ gnome-session.spec	13 Jun 2009 00:15:24 -0000	1.235
@@ -10,7 +10,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.26.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -177,6 +177,9 @@ fi
 
 
 %changelog
+* Fri Jun 12 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-3
+- Fix some oversights in the PolicyKit port
+
 * Tue May 12 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-2
 - Port to PolicyKit 1
 

polkit1.patch:

Index: polkit1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/polkit1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- polkit1.patch	10 Jun 2009 05:16:38 -0000	1.1
+++ polkit1.patch	13 Jun 2009 00:15:24 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gnome-session-2.26.1/configure.in.polkit1 gnome-session-2.26.1/configure.in
 --- gnome-session-2.26.1/configure.in.polkit1	2009-04-14 11:31:47.000000000 -0400
-+++ gnome-session-2.26.1/configure.in	2009-05-14 10:34:17.929350281 -0400
++++ gnome-session-2.26.1/configure.in	2009-06-12 19:51:49.223577026 -0400
 @@ -31,7 +31,7 @@ AC_ARG_WITH(at-spi-registryd-directory,
  AT_SPI_REGISTRYD_DIR=$with_at_spi_registryd_directory
  AC_SUBST(AT_SPI_REGISTRYD_DIR)
@@ -42,7 +42,7 @@ diff -up gnome-session-2.26.1/configure.
  dnl GConf Checks
 diff -up gnome-session-2.26.1/gnome-session/gsm-consolekit.c.polkit1 gnome-session-2.26.1/gnome-session/gsm-consolekit.c
 --- gnome-session-2.26.1/gnome-session/gsm-consolekit.c.polkit1	2009-04-14 11:31:45.000000000 -0400
-+++ gnome-session-2.26.1/gnome-session/gsm-consolekit.c	2009-05-13 23:47:00.667014605 -0400
++++ gnome-session-2.26.1/gnome-session/gsm-consolekit.c	2009-06-12 19:57:53.643580353 -0400
 @@ -31,10 +31,6 @@
  #include <dbus/dbus-glib.h>
  #include <dbus/dbus-glib-lowlevel.h>
@@ -494,7 +494,7 @@ diff -up gnome-session-2.26.1/gnome-sess
                                                G_TYPE_INVALID,
 -                                              /* return values: */
 -                                              G_TYPE_STRING, &type,
-+                                              &can_restart,
++                                              G_TYPE_BOOLEAN, &can_restart,
                                                G_TYPE_INVALID);
  
 -        /* error is bad: we consider there's another user */
@@ -723,7 +723,7 @@ diff -up gnome-session-2.26.1/gnome-sess
 +                                              INT_MAX,
 +                                              error,
 +                                              G_TYPE_INVALID,
-+                                              &can_stop,
++                                              G_TYPE_BOOLEAN, &can_stop,
 +                                              G_TYPE_INVALID);
  
 -gboolean
@@ -742,7 +742,7 @@ diff -up gnome-session-2.26.1/gnome-sess
  gchar *
 diff -up gnome-session-2.26.1/gnome-session/Makefile.am.polkit1 gnome-session-2.26.1/gnome-session/Makefile.am
 --- gnome-session-2.26.1/gnome-session/Makefile.am.polkit1	2009-04-14 11:31:45.000000000 -0400
-+++ gnome-session-2.26.1/gnome-session/Makefile.am	2009-05-14 10:34:41.744457421 -0400
++++ gnome-session-2.26.1/gnome-session/Makefile.am	2009-06-12 19:51:49.228578549 -0400
 @@ -16,7 +16,6 @@ INCLUDES =					\
  	$(ICE_CFLAGS)				\
  	$(GNOME_SESSION_CFLAGS)			\