rpms/gnome-panel/devel dst-offset.patch, NONE, 1.1 gnome-panel.spec, 1.261, 1.262

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	gnome-panel.spec 
Added Files:
	dst-offset.patch 
Log Message:
Some more intlclock fixes


dst-offset.patch:

--- NEW FILE dst-offset.patch ---
diff -up gnome-panel-2.21.91/applets/clock/clock-location.c.dst-offset gnome-panel-2.21.91/applets/clock/clock-location.c
--- gnome-panel-2.21.91/applets/clock/clock-location.c.dst-offset	2008-02-19 22:18:55.000000000 -0500
+++ gnome-panel-2.21.91/applets/clock/clock-location.c	2008-02-19 22:19:03.000000000 -0500
@@ -645,17 +645,30 @@ glong
 clock_location_get_offset (ClockLocation *loc)
 {
         ClockLocationPrivate *priv = PRIVATE (loc);
-        glong sys_timezone;
+        glong sys_timezone, local_timezone;
 	glong offset;
+	time_t t;
+	struct tm *tm;
 
+	t = time (NULL);
+	
         unsetenv ("TZ");
-        tzset ();
+        tm = localtime (&t);
         sys_timezone = timezone;
 
+	if (tm->tm_isdst > 0) {
+		sys_timezone -= 3600;
+	}
+
         setenv ("TZ", priv->timezone, 1);
-        tzset();
+        tm = localtime (&t);
+	local_timezone = timezone;
+
+	if (tm->tm_isdst > 0) {
+		local_timezone -= 3600;
+	}
 
-        offset = timezone - sys_timezone;
+        offset = local_timezone - sys_timezone;
 
         if (priv->sys_timezone) {
                 setenv ("TZ", priv->sys_timezone, 1);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- gnome-panel.spec	18 Feb 2008 06:15:13 -0000	1.261
+++ gnome-panel.spec	20 Feb 2008 03:25:43 -0000	1.262
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.21.91
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2
 
@@ -108,21 +108,24 @@
 
 Patch14: gnome-panel-2.21.5-ck-shutdown.patch
 
-# fix display of times in location tiles in the clock
+# fix display of times in location tiles in the clock; fixed upstream
 Patch15: localtime.patch
 
-# fix some focus issues with preference dialogs
+# fix some focus issues with preference dialogs; fixed upstream
 Patch16: pref-dialogs.patch
 
-# make set buttons on location tiles work
+# make set buttons on location tiles work; fixed upstream
 Patch17: set-button.patch
 
-# fix display of weather in the panel button
+# fix display of weather in the panel button; fixed upstream
 Patch18: panel-weather.patch
 
-# make timezone setting asynchronous
+# make timezone setting asynchronous; fixed upstream
 Patch19: async-timezone.patch
 
+# take daylight savings time into account for offsets
+Patch20: dst-offset.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -173,6 +176,7 @@
 %patch17 -p1 -b .set-button
 %patch18 -p1 -b .panel-weather
 %patch19 -p1 -b .async-timezone
+%patch20 -p1 -b .dst-offset
 
 . %{SOURCE6}
 
@@ -357,6 +361,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Feb 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.91-5
+- Take daylight savings time into account when calculating offsets
+
 * Mon Feb 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.91-4
 - Another round of intlclock fixes