- merged from DEVEL

Changed files:
    gnome-panel-use-sysconfig-timezone.patch -> 1.2

diff --git a/gnome-panel-use-sysconfig-timezone.patch b/gnome-panel-use-sysconfig-timezone.patch
index 66500cea7e51ac2ba925b10c09cf0fc07614a8db..1a60ab67d88e59685b5d642672a9468e7a19d37f 100644 (file)
--- a/gnome-panel-use-sysconfig-timezone.patch
+++ b/gnome-panel-use-sysconfig-timezone.patch
@@ -2,19 +2,18 @@ Index: applets/clock/system-timezone.c
 ===================================================================
 --- applets/clock/system-timezone.c    (revision 11072)
 +++ applets/clock/system-timezone.c    (working copy)
-@@ -67,23 +67,25 @@
+@@ -67,13 +67,14 @@
  #include "system-timezone.h"
  
  /* Files that we look at and that should be monitored */
 -#define CHECK_NB 5
-+#define CHECK_NB 6
- #ifndef SYSTZ_SET_TEST
 -#define ETC_TIMEZONE        "/etc/timezone"
 -#define ETC_TIMEZONE_MAJ    "/etc/TIMEZONE"
 -#define ETC_RC_CONF         "/etc/rc.conf"
 -#define ETC_SYSCONFIG_CLOCK "/etc/sysconfig/clock"
 -#define ETC_CONF_D_CLOCK    "/etc/conf.d/clock"
 -#define ETC_LOCALTIME       "/etc/localtime"
++#define CHECK_NB 6
 +#define ETC_TIMEZONE           "/etc/timezone"
 +#define ETC_TIMEZONE_MAJ       "/etc/TIMEZONE"
 +#define ETC_RC_CONF            "/etc/rc.conf"
@@ -22,26 +21,9 @@ Index: applets/clock/system-timezone.c
 +#define ETC_SYSCONFIG_TIMEZONE "/etc/sysconfig/timezone"
 +#define ETC_CONF_D_CLOCK       "/etc/conf.d/clock"
 +#define ETC_LOCALTIME          "/etc/localtime"
- #else
- /* Filenames that will be writable for testing */
--#define TEST_PREFIX         "/tmp/systz-test"
--#define ETC_TIMEZONE        TEST_PREFIX"/etc/timezone"
--#define ETC_TIMEZONE_MAJ    TEST_PREFIX"/etc/TIMEZONE"
--#define ETC_RC_CONF         TEST_PREFIX"/etc/rc.conf"
--#define ETC_SYSCONFIG_CLOCK TEST_PREFIX"/etc/sysconfig/clock"
--#define ETC_CONF_D_CLOCK    TEST_PREFIX"/etc/conf.d/clock"
--#define ETC_LOCALTIME       TEST_PREFIX"/etc/localtime"
-+#define TEST_PREFIX            "/tmp/systz-test"
-+#define ETC_TIMEZONE           TEST_PREFIX"/etc/timezone"
-+#define ETC_TIMEZONE_MAJ       TEST_PREFIX"/etc/TIMEZONE"
-+#define ETC_RC_CONF            TEST_PREFIX"/etc/rc.conf"
-+#define ETC_SYSCONFIG_CLOCK    TEST_PREFIX"/etc/sysconfig/clock"
-+#define ETC_SYSCONFIG_TIMEZONE TEST_PREFIX"/etc/sysconfig/timezone"
-+#define ETC_CONF_D_CLOCK       TEST_PREFIX"/etc/conf.d/clock"
-+#define ETC_LOCALTIME          TEST_PREFIX"/etc/localtime"
- #endif /* SYSTZ_SET_TEST */
  
  /* The first 4 characters in a timezone file, from tzfile.h */
+ #define TZ_MAGIC "TZif"
 @@ -93,6 +95,7 @@
          ETC_TIMEZONE,
          ETC_TIMEZONE_MAJ,