From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sat, 3 Mar 2012 11:56:07 +0000 (+0000)
Subject: - use pld config for timezone
X-Git-Tag: auto/th/system-config-date-1_9_67-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fsystem-config-date.git;a=commitdiff_plain;h=587e00180ccb6cfd37d947787653a5e0e927e5ea

- use pld config for timezone

Changed files:
    system-config-date.spec -> 1.15
    tzconfig.patch -> 1.1
---

diff --git a/system-config-date.spec b/system-config-date.spec
index b939956..214885b 100644
--- a/system-config-date.spec
+++ b/system-config-date.spec
@@ -2,12 +2,13 @@ Summary:	A graphical interface for modifying system date and time
 Summary(pl.UTF-8):	Graficzny interfejs do zmiany daty i czasu systemowego
 Name:		system-config-date
 Version:	1.9.67
-Release:	0.2
+Release:	1
 License:	GPL
 Group:		Base
 Source0:	http://fedorahosted.org/released/system-config-date/%{name}-%{version}.tar.bz2
 # Source0-md5:	5af4caafb46a9c63a5fcc6e0e6e4d2e4
 Patch0:		%{name}-desktop.patch
+Patch1:		tzconfig.patch
 URL:		http://fedoraproject.org/wiki/SystemConfig/date
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext-devel
@@ -43,6 +44,7 @@ synchronizacji czasu systemowego z serwerem czasu NTP.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make}
diff --git a/tzconfig.patch b/tzconfig.patch
new file mode 100644
index 0000000..1b04b21
--- /dev/null
+++ b/tzconfig.patch
@@ -0,0 +1,64 @@
+--- system-config-date-1.9.67/./src/scdate/core/timezoneBackend.py~	2011-10-18 13:49:29.000000000 +0300
++++ system-config-date-1.9.67/./src/scdate/core/timezoneBackend.py	2012-03-03 13:52:47.103894646 +0200
+@@ -49,12 +49,12 @@
+             #If it does, copy the new time zone file into the chroot jail
+             linkorcopyfile (fromFile, "/var/spool/postfix/etc/localtime")
+ 
+-        #Write info to the /etc/sysconfig/clock file
++        #Write info to the /etc/sysconfig/timezone file
+         f = open("/etc/sysconfig/clock", "w")
+         f.write ("# The time zone of the system is defined by the contents of /etc/localtime.\n")
+         f.write ("# This file is only for evaluation by system-config-date, do not rely on its\n")
+         f.write ("# contents elsewhere.\n")
+-        f.write('ZONE="%s"\n' % timezone)
++        f.write('TIMEZONE="%s"\n' % timezone)
+         f.close()
+ 
+         if self._adjtimeHasUTCInfo:
+@@ -81,7 +81,7 @@
+     def __init__(self):
+         self.tz = "America/New_York"
+         self.utc = "false"
+-        path = '/etc/sysconfig/clock'
++        path = '/etc/sysconfig/timezone'
+         lines = []
+         self._canHwClock = None
+         self._adjtimeHasUTCInfo = None
+@@ -91,7 +91,7 @@
+             lines = fd.readlines()
+             fd.close()
+         else:
+-            #There's no /etc/sysconfig/clock file, so make one
++            #There's no /etc/sysconfig/timezone file, so make one
+             fd = open(path, 'w')
+             fd.close
+             pass
+@@ -103,7 +103,7 @@
+                     continue
+                 try:
+                     tokens = line.split ("=")
+-                    if tokens[0] == "ZONE":
++                    if tokens[0] == "TIMEZONE":
+                         self.tz = tokens[1].replace ('"', '')
+                         self.tz = self.tz.replace ('_', ' ')
+                 except:
+--- system-config-date-1.9.67/./src/timezone_map_gui.py~	2011-10-18 13:49:29.000000000 +0300
++++ system-config-date-1.9.67/./src/timezone_map_gui.py	2012-03-03 13:53:15.975214698 +0200
+@@ -214,7 +214,7 @@
+             if entry.tz == default:
+                 self.currentEntry = entry
+             if entry.tz == "America/New York":
+-                #In case the /etc/sysconfig/clock is messed up, use New York as default
++                #In case the /etc/sysconfig/timezone is messed up, use New York as default
+                 self.fallbackEntry = entry
+ 
+         self.treeStore.set_sort_column_id (self.columns.TZSORT, gtk.SORT_ASCENDING)
+@@ -604,7 +604,7 @@
+             self.markers[self.currentEntry.tz].show ()
+ 
+         if not entry:
+-            # If the value in /etc/sysconfig/clock is invalid, default to New York
++            # If the value in /etc/sysconfig/timezone is invalid, default to New York
+             self.currentEntry = self.fallbackEntry
+         else:
+             self.currentEntry = entry