From f2868034b7ab68af1e5330544766a554907a4b96 Mon Sep 17 00:00:00 2001
From: Richard Hughes <rhughes@fedoraproject.org>
Date: Feb 27 2009 17:13:06 +0000
Subject: - Backport patch from svn to not block logout


---

diff --git a/gnome-power-manager-2.25.91-dont-block-logout.patch b/gnome-power-manager-2.25.91-dont-block-logout.patch
new file mode 100644
index 0000000..d79ded1
--- /dev/null
+++ b/gnome-power-manager-2.25.91-dont-block-logout.patch
@@ -0,0 +1,20 @@
+Index: src/gpm-main.c
+===================================================================
+--- src/gpm-main.c	(revision 3290)
++++ src/gpm-main.c	(revision 3291)
+@@ -203,9 +203,12 @@
+ 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+                                            GPM_DATA G_DIR_SEPARATOR_S "icons");
+ 
+-	/* we have to register with the session as we are starting up with the panel */
++	/* optionally register with the session */
+ 	session = gpm_session_new ();
+-	gpm_session_register_client (session, "gnome-power-manager", getenv ("DESKTOP_AUTOSTART_ID"));
++	if (FALSE) {
++		egg_warning ("register with the session requires logout handling");
++		gpm_session_register_client (session, "gnome-power-manager", getenv ("DESKTOP_AUTOSTART_ID"));
++	}
+ 
+ 	/* create a new gui object */
+ 	manager = gpm_manager_new ();
+
diff --git a/gnome-power-manager.spec b/gnome-power-manager.spec
index 722c10b..07a6369 100644
--- a/gnome-power-manager.spec
+++ b/gnome-power-manager.spec
@@ -4,13 +4,16 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.25.91
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 
+# already upstream in SVN
+Patch1: gnome-power-manager-2.25.91-dont-block-logout.patch
+
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
@@ -53,6 +56,7 @@ change preferences.
 
 %prep
 %setup -q
+%patch1 -p0 -b .block-logout
 
 %build
 %configure \
@@ -160,6 +164,9 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Fri Feb 27 2009 Richard Hughes  <rhughes@redhat.com> - 2.25.91-5
+- Backport patch from svn to not block logout
+
 * Fri Feb 27 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.91-4
 - Require PolicyKit-authentication-agent