rpms/gnome-power-manager/F-12 cookie.patch, NONE, 1.1 gnome-power-manager.spec, 1.175, 1.176

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31956

Modified Files:
	gnome-power-manager.spec 
Added Files:
	cookie.patch 
Log Message:
Fix a possible segfault


cookie.patch:
 gpm-disks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cookie.patch ---
diff -up gnome-power-manager-2.28.0/src/gpm-disks.c.cookie gnome-power-manager-2.28.0/src/gpm-disks.c
--- gnome-power-manager-2.28.0/src/gpm-disks.c.cookie	2009-10-13 18:19:04.176391449 -0400
+++ gnome-power-manager-2.28.0/src/gpm-disks.c	2009-10-13 18:19:15.790139458 -0400
@@ -95,7 +95,7 @@ gpm_disks_register (GpmDisks *disks, gui
 				 G_TYPE_INT, timeout,
 				 G_TYPE_STRV, options,
 				 G_TYPE_INVALID,
-				 G_TYPE_STRING, disks->priv->cookie,
+				 G_TYPE_STRING, &disks->priv->cookie,
 				 G_TYPE_INVALID);
 	if (!ret) {
 		egg_warning ("failed to set spindown timeout: %s", error->message);


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- gnome-power-manager.spec	21 Sep 2009 12:43:33 -0000	1.175
+++ gnome-power-manager.spec	13 Oct 2009 22:23:05 -0000	1.176
@@ -5,7 +5,7 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -46,6 +46,9 @@ Requires(post): GConf2
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=598339
+Patch0: cookie.patch
+
 %description
 GNOME Power Manager uses the information and facilities provided by HAL
 displaying icons and handling user callbacks in an interactive GNOME session.
@@ -63,6 +66,7 @@ Extra GNOME power management application
 %prep
 %setup -q
 #%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%patch0 -p1 -b .cookie
 
 %build
 %configure \
@@ -181,6 +185,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Tue Oct 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Fix possible segfault
+
 * Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-1
 - Update to 2.28.0