rpm/timezone
SHA256
1
0
Fork 0
forked from pool/timezone
Code Pull Requests Activity

Accepting request 183146 from Base:System

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/183146
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/timezone?expand=0&rev=75
This commit is contained in:
Stephan Kulow 2013-07-16 14:24:47 +00:00 committed by Git OBS Bridge
commit 0e969e05ee
12 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iso3166-uk.diff
View File

@ -2,7 +2,7 @@ Index: iso3166.tab
===================================================================
--- iso3166.tab.orig
+++ iso3166.tab
@@ -101,7 +101,7 @@ FM Micronesia
@@ -100,7 +100,7 @@ FM Micronesia
FO Faroe Islands
FR France
GA Gabon

15
timezone-java.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Mon Jul 8 16:53:30 UTC 2013 - dmueller@suse.com
- update to 2013d:
* Morocco's midsummer transitions this year are July 7 and August 10,
not July 9 and August 8. (Thanks to Andrew Paprocki.)
* Israel now falls back on the last Sunday of October.
-------------------------------------------------------------------
Mon Apr 29 20:47:33 UTC 2013 - crrodriguez@opensuse.org
- /etc/localtime must be a symlink to /usr/share/zoneinfo/$TIMEZONE
so systemd-timedated and its command line tool timedatectl
can work correctly. Yast already does the right thing.
-------------------------------------------------------------------
Sat Apr 20 16:41:02 UTC 2013 - crrodriguez@opensuse.org

2
timezone-java.spec
View File

@ -25,7 +25,7 @@ License: BSD-3-Clause and SUSE-Public-Domain
Group: System/Base
# COMMON-BEGIN
# COMMON-BEGIN
Version: 2013c
Version: 2013d
Release: 0
Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz

13
timezone.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Jul 8 17:28:01 UTC 2013 - dmueller@suse.com
- restrict symlink change to systemd distros
-------------------------------------------------------------------
Mon Jul 8 16:53:30 UTC 2013 - dmueller@suse.com
- update to 2013d:
* Morocco's midsummer transitions this year are July 7 and August 10,
not July 9 and August 8. (Thanks to Andrew Paprocki.)
* Israel now falls back on the last Sunday of October.
-------------------------------------------------------------------
Mon Apr 29 20:47:33 UTC 2013 - crrodriguez@opensuse.org

10
timezone.spec
View File

@ -23,7 +23,7 @@ Group: System/Base
Url: http://www.iana.org/time-zones
PreReq: filesystem, coreutils
# COMMON-BEGIN
Version: 2013c
Version: 2013d
Release: 0
Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz
@ -92,7 +92,13 @@ if [ -f /etc/sysconfig/clock ];
then
. /etc/sysconfig/clock
if [ -n "$TIMEZONE" -a -f /etc/localtime -a -f /usr/share/zoneinfo/$TIMEZONE ]; then
ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime
%if 0%{?suse_version} >= 1230
ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime
%else
new=$(mktemp /etc/localtime.XXXXXXXX) || exit 1
cp -l /usr/share/zoneinfo/$TIMEZONE $new 2>/dev/null || cp -fp /usr/share/zoneinfo/$TIMEZONE $new
mv -f $new /etc/localtime
%endif
else
[ ! -f /etc/localtime ] || echo "WARNING: Not updating /etc/localtime with new zone file" >&2
fi

18
tzcode-symlink.patch
View File

@ -1,17 +1,17 @@
Index: timezone-2012h/zic.c
Index: timezone-2013d/zic.c
===================================================================
--- timezone-2012h.orig/zic.c
+++ timezone-2012h/zic.c
@@ -110,7 +110,7 @@ static int addtype(long gmtoff, const ch
--- timezone-2013d.orig/zic.c
+++ timezone-2013d/zic.c
@@ -110,7 +110,7 @@ static int addtype(zic_t gmtoff, const c
static void leapadd(zic_t t, int positive, int rolling, int count);
static void adjleap(void);
static void associate(void);
-static void dolink(const char * fromfield, const char * tofield);
+static void dolink(const char * fromfield, const char * tofield, int defaultsymlink);
static long eitol(int i);
static char ** getfields(char * buf);
static long gethms(const char * string, const char * errstrng,
@@ -558,7 +558,7 @@ _("%s: More than one -L option specified
static zic_t gethms(const char * string, const char * errstrng,
int signable);
@@ -557,7 +557,7 @@ _("%s: More than one -L option specified
*/
for (i = 0; i < nlinks; ++i) {
eat(links[i].l_filename, links[i].l_linenum);
@ -20,7 +20,7 @@ Index: timezone-2012h/zic.c
if (noise)
for (j = 0; j < nlinks; ++j)
if (strcmp(links[i].l_to,
@@ -567,17 +567,17 @@ _("%s: More than one -L option specified
@@ -566,17 +566,17 @@ _("%s: More than one -L option specified
}
if (lcltime != NULL) {
eat("command line", 1);
@ -41,7 +41,7 @@ Index: timezone-2012h/zic.c
{
register char * fromname;
register char * toname;
@@ -602,15 +602,16 @@ dolink(const char *const fromfield, cons
@@ -601,15 +601,16 @@ dolink(const char *const fromfield, cons
*/
if (!itsdir(toname))
(void) remove(toname);

2
tzcode-zic.diff
View File

@ -2,7 +2,7 @@ Index: zic.c
===================================================================
--- zic.c.orig
+++ zic.c
@@ -625,8 +625,10 @@ dolink(const char *const fromfield, cons
@@ -624,8 +624,10 @@ dolink(const char *const fromfield, cons
fromname);
result = symlink(symlinkcontents,
toname);

3
tzcode2013c.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e46ee931927273108db1c6b5ab86c37210e903536a910b35a5699a08799bd6f0
size 135554

3
tzcode2013d.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2d9eb90c94644cddb74a490d1184ef9f88efcaa7a2b1bf88be0ee9eeeab707b6
size 138198

8
tzdata-china.diff
View File

@ -1,3 +1,5 @@
Index: asia
===================================================================
--- asia.orig
+++ asia
@@ -489,6 +489,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o
@ -10,6 +12,8 @@
# Hong Kong (Xianggang)
# Milne gives 7:36:41.7; round this.
Index: backward
===================================================================
--- backward.orig
+++ backward
@@ -87,14 +87,13 @@ Link America/Mexico_City Mexico/General
@ -28,9 +32,11 @@
Link Asia/Seoul ROK
Link Asia/Singapore Singapore
Link Europe/Istanbul Turkey
Index: zone.tab
===================================================================
--- zone.tab.orig
+++ zone.tab
@@ -146,11 +146,12 @@ CK -2114-15946 Pacific/Rarotonga
@@ -153,11 +153,12 @@ CK -2114-15946 Pacific/Rarotonga
CL -3327-07040 America/Santiago most locations
CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez
CM +0403+00942 Africa/Douala

3
tzdata2013c.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e597a7eb239155eb2247fd4788f7fa10bf21d6469961200a6ca202f19cc15c87
size 218466

3
tzdata2013d.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cd1c96f0676e0edceebc6a418a2222ffb05becb41180dd9f847b9c7cef303b04
size 218918