diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2008-04-23 14:20:50 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2008-04-23 14:20:50 +0000 |
| commit | 6b73ecb777163636fdacd7634be05a2c98dcd939 (patch) | |
| tree | f8da1bbb63ecf881f4a7102110bcd5bc90d71f58 | |
| parent | 02c4cb5f41f489729f7853596dda3cf09a1d32e0 (diff) | |
| download | gnome-panel-6b73ecb777163636fdacd7634be05a2c98dcd939.tar.gz gnome-panel-6b73ecb777163636fdacd7634be05a2c98dcd939.tar.xz gnome-panel-6b73ecb777163636fdacd7634be05a2c98dcd939.zip | |
clean up patch
| -rw-r--r-- | gnome-panel.spec | 5 | ||||
| -rw-r--r-- | timezone-debug.patch | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec index dbcf97f..857677f 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -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 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Wed Apr 23 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.1.2-6 +- Remove an erroneous addition in the last patch + * Tue Apr 22 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.1.2-5 - Add another patch that may fix timezone setting problems (#443415) diff --git a/timezone-debug.patch b/timezone-debug.patch index d7fbf43..39d4735 100644 --- a/timezone-debug.patch +++ b/timezone-debug.patch @@ -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", |