rpms/gnome-panel/F-9 gnome-panel.spec, 1.296, 1.297 timezone-debug.patch, 1.2, 1.3
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Wed Apr 23 14:08:32 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/gnome-panel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14223
Modified Files:
gnome-panel.spec timezone-debug.patch
Log Message:
Clean up the last patch
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/F-9/gnome-panel.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- gnome-panel.spec 23 Apr 2008 00:24:39 -0000 1.296
+++ gnome-panel.spec 23 Apr 2008 14:07:47 -0000 1.297
@@ -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/F-9/timezone-debug.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- timezone-debug.patch 23 Apr 2008 00:24:39 -0000 1.2
+++ timezone-debug.patch 23 Apr 2008 14:07:47 -0000 1.3
@@ -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",
More information about the fedora-extras-commits
mailing list