rpms/gnome-panel/devel timezone-debug.patch, NONE, 1.1 gnome-panel.spec, 1.294, 1.295

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19836

Modified Files:
	gnome-panel.spec 
Added Files:
	timezone-debug.patch 
Log Message:
try to fix a timezone setting problem


timezone-debug.patch:

--- NEW FILE timezone-debug.patch ---
diff -up gnome-panel-2.22.1.2/applets/clock/system-timezone.c.debug gnome-panel-2.22.1.2/applets/clock/system-timezone.c
--- gnome-panel-2.22.1.2/applets/clock/system-timezone.c.debug	2008-04-22 19:22:48.000000000 -0400
+++ gnome-panel-2.22.1.2/applets/clock/system-timezone.c	2008-04-22 20:16:44.000000000 -0400
@@ -863,7 +863,8 @@ system_timezone_is_zone_file_valid (cons
                 return FALSE;
         }
 
-        if (read != 4 || strcmp (buffer, TZ_MAGIC) != 0) {
+        if (read != strlen (TZ_MAGIC) || strncmp (buffer, TZ_MAGIC, strlen (TZ_MAGIC)) != 0) {
+		buffer[read] = 0;
                 g_set_error (error, SYSTEM_TIMEZONE_ERROR,
                              SYSTEM_TIMEZONE_ERROR_INVALID_TIMEZONE_FILE,
                              "%s is not a timezone file",


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- gnome-panel.spec	22 Apr 2008 16:11:33 -0000	1.294
+++ gnome-panel.spec	23 Apr 2008 01:59:16 -0000	1.295
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.22.1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar.bz2
 
@@ -127,6 +127,7 @@
 Patch34: gnome-panel-launch-with-gio.patch
 # fixed in upstream svn
 Patch35: timezone-64.patch
+Patch36: timezone-debug.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -182,6 +183,7 @@
 %patch33 -p1 -b .use-gio
 %patch34 -p1 -b .launch-with-gio
 %patch35 -p1 -b .timezone-64
+%patch36 -p1 -b .timezone-debug
 
 . %{SOURCE6}
 
@@ -366,6 +368,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Apr 22 2008 Matthias Clasen  <mclasen at redhat.com> - 2.22.1.2-5
+- Add another patch that may fix timezone setting problems (#443415)
+
 * Fri Apr 18 2008 Matthias Clasen  <mclasen at redhat.com> - 2.22.1.2-4
 - Use gio to open places 
 - Fix a 64bit issue with timezone handling in the clock