rpms/gnome-panel/devel gnome-panel.spec, 1.295, 1.296 timezone-debug.patch, 1.1, 1.2

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	gnome-panel.spec timezone-debug.patch 
Log Message:
clean up patch



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- gnome-panel.spec	23 Apr 2008 01:59:16 -0000	1.295
+++ gnome-panel.spec	23 Apr 2008 14:20:50 -0000	1.296
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.22.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar.bz2
 
@@ -368,6 +368,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Apr 23 2008 Matthias Clasen  <mclasen at redhat.com> - 2.22.1.2-6
+- Remove an erroneous addition in the last patch
+
 * 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)
 

timezone-debug.patch:

Index: timezone-debug.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/timezone-debug.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- timezone-debug.patch	23 Apr 2008 01:59:16 -0000	1.1
+++ timezone-debug.patch	23 Apr 2008 14:20:50 -0000	1.2
@@ -1,13 +1,12 @@
-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
+diff -up gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-debug gnome-panel-2.22.1.2/applets/clock/system-timezone.c
+--- gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-debug	2008-04-22 20:17:15.000000000 -0400
++++ gnome-panel-2.22.1.2/applets/clock/system-timezone.c	2008-04-23 10:05:34.000000000 -0400
+@@ -863,7 +863,7 @@ 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",