Author: patrys Date: Mon Feb 1 10:53:47 2010 GMT Module: packages Tag: DEVEL ---- Log message: - 2.29.6
---- Files affected: packages/gnome-panel: gnome-panel-use-sysconfig-timezone.patch (1.1 -> 1.1.2.1) , gnome-panel.spec (1.235.2.1 -> 1.235.2.2) ---- Diffs: ================================================================ Index: packages/gnome-panel/gnome-panel-use-sysconfig-timezone.patch diff -u packages/gnome-panel/gnome-panel-use-sysconfig-timezone.patch:1.1 packages/gnome-panel/gnome-panel-use-sysconfig-timezone.patch:1.1.2.1 --- packages/gnome-panel/gnome-panel-use-sysconfig-timezone.patch:1.1 Sun Apr 27 00:03:04 2008 +++ packages/gnome-panel/gnome-panel-use-sysconfig-timezone.patch Mon Feb 1 11:53:42 2010 @@ -2,19 +2,18 @@ =================================================================== --- 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 @@ +#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, ================================================================ Index: packages/gnome-panel/gnome-panel.spec diff -u packages/gnome-panel/gnome-panel.spec:1.235.2.1 packages/gnome-panel/gnome-panel.spec:1.235.2.2 --- packages/gnome-panel/gnome-panel.spec:1.235.2.1 Wed Jan 13 12:35:11 2010 +++ packages/gnome-panel/gnome-panel.spec Mon Feb 1 11:53:42 2010 @@ -2,12 +2,12 @@ Summary: The core programs for the GNOME GUI desktop environment Summary(pl.UTF-8): Podstawowe programy środowiska graficznego GNOME Name: gnome-panel -Version: 2.29.5 +Version: 2.29.6 Release: 1 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.29/%{name}-%{version}.tar.bz2 -# Source0-md5: 9220c0696b189fd3ae16b007569b8a51 +# Source0-md5: c798236a3c8168f417fef010d45359c2 Patch0: %{name}-no_launchers_on_panel.patch # http://bugzilla.gnome.org/show_bug.cgi?id=552049 Patch1: %{name}-use-sysconfig-timezone.patch @@ -136,6 +136,8 @@ %setup -q %patch0 -p1 %patch1 -p0 +sed -i s#...@shaw## po/LINGUAS +rm po/e...@shaw.po # short circuit stopper (fix me!) mv ChangeLog main-ChangeLog @@ -273,6 +275,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.235.2.2 2010/02/01 10:53:42 patrys +- 2.29.6 + Revision 1.235.2.1 2010/01/13 11:35:11 patrys - 2.29.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-panel/gnome-panel-use-sysconfig-timezone.patch?r1=1.1&r2=1.1.2.1&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-panel/gnome-panel.spec?r1=1.235.2.1&r2=1.235.2.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit