From 8ea380b984ec051b220932a453122e3b8187bf686cfe7fc456a5d1ac4e58d56a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 26 Mar 2014 14:07:41 +0000 Subject: [PATCH] Accepting request 227598 from home:leonardocf:branches:Base:System Update to 2014b (bnc#870375): OBS-URL: https://build.opensuse.org/request/show/227598 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=133 --- timezone-java.changes | 7 +++++++ timezone-java.spec | 2 +- timezone-java.spec.in | 2 +- timezone.changes | 7 +++++++ timezone.spec | 2 +- tzcode-fromname.patch | 8 +++++--- tzcode-symlink.patch | 14 ++++++++------ tzcode-zic.diff | 8 +++++--- tzcode2014a.tar.gz | 3 --- tzcode2014b.tar.gz | 3 +++ tzdata-china.diff | 20 +++++++++++++------- tzdata2014a.tar.gz | 3 --- tzdata2014b.tar.gz | 3 +++ 13 files changed, 54 insertions(+), 28 deletions(-) delete mode 100644 tzcode2014a.tar.gz create mode 100644 tzcode2014b.tar.gz delete mode 100644 tzdata2014a.tar.gz create mode 100644 tzdata2014b.tar.gz diff --git a/timezone-java.changes b/timezone-java.changes index 34e2b72..b6a44d1 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 26 13:02:00 UTC 2014 - lchiquitto@suse.com + +- update to 2014b (bnc#870375): + * Crimea switches to Moscow time on 2014-03-30 at 02:00 local time + * New entry for Troll station, Antarctica + ------------------------------------------------------------------- Thu Mar 20 07:59:57 UTC 2014 - meissner@suse.com diff --git a/timezone-java.spec b/timezone-java.spec index 5a4bbc8..0a8f1d0 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -25,7 +25,7 @@ License: BSD-3-Clause and SUSE-Public-Domain Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2014a +Version: 2014b Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz diff --git a/timezone-java.spec.in b/timezone-java.spec.in index efcd53a..66ab3fc 100644 --- a/timezone-java.spec.in +++ b/timezone-java.spec.in @@ -1,7 +1,7 @@ # # spec file for package timezone-java # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/timezone.changes b/timezone.changes index 34e2b72..b6a44d1 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 26 13:02:00 UTC 2014 - lchiquitto@suse.com + +- update to 2014b (bnc#870375): + * Crimea switches to Moscow time on 2014-03-30 at 02:00 local time + * New entry for Troll station, Antarctica + ------------------------------------------------------------------- Thu Mar 20 07:59:57 UTC 2014 - meissner@suse.com diff --git a/timezone.spec b/timezone.spec index 06aa402..d57541e 100644 --- a/timezone.spec +++ b/timezone.spec @@ -23,7 +23,7 @@ Group: System/Base Url: http://www.iana.org/time-zones PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2014a +Version: 2014b Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz diff --git a/tzcode-fromname.patch b/tzcode-fromname.patch index 55476f9..b10937b 100644 --- a/tzcode-fromname.patch +++ b/tzcode-fromname.patch @@ -1,6 +1,8 @@ ---- timezone-2013g/zic.c -+++ timezone-2013g/zic.c 2013-10-14 13:52:42.070235810 +0000 -@@ -628,17 +628,17 @@ dolink(const char *const fromfield, cons +Index: timezone-2014b/zic.c +=================================================================== +--- timezone-2014b.orig/zic.c ++++ timezone-2014b/zic.c +@@ -656,17 +656,17 @@ dolink(const char *const fromfield, cons result = link(fromname, toname); if (result != 0) { diff --git a/tzcode-symlink.patch b/tzcode-symlink.patch index 59b197c..839cc7b 100644 --- a/tzcode-symlink.patch +++ b/tzcode-symlink.patch @@ -1,5 +1,7 @@ ---- timezone-2013g/zic.c -+++ timezone-2013g/zic.c 2013-10-14 14:23:08.450235811 +0000 +Index: timezone-2014b/zic.c +=================================================================== +--- timezone-2014b.orig/zic.c ++++ timezone-2014b/zic.c @@ -120,7 +120,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); @@ -9,7 +11,7 @@ static char ** getfields(char * buf); static zic_t gethms(const char * string, const char * errstrng, int signable); -@@ -575,7 +575,7 @@ _("%s: More than one -L option specified +@@ -603,7 +603,7 @@ _("%s: More than one -L option specified */ for (i = 0; i < nlinks; ++i) { eat(links[i].l_filename, links[i].l_linenum); @@ -18,7 +20,7 @@ if (noise) for (j = 0; j < nlinks; ++j) if (strcmp(links[i].l_to, -@@ -584,18 +584,19 @@ _("%s: More than one -L option specified +@@ -612,18 +612,19 @@ _("%s: More than one -L option specified } if (lcltime != NULL) { eat("command line", 1); @@ -41,7 +43,7 @@ register char * fromname; register char * toname; -@@ -606,6 +607,10 @@ dolink(const char *const fromfield, cons +@@ -634,6 +635,10 @@ dolink(const char *const fromfield, cons fromname = ecatalloc(fromname, "/"); fromname = ecatalloc(fromname, fromfield); } @@ -52,7 +54,7 @@ if (tofield[0] == '/') toname = ecpyalloc(tofield); else { -@@ -619,15 +624,16 @@ dolink(const char *const fromfield, cons +@@ -647,15 +652,16 @@ dolink(const char *const fromfield, cons */ if (!itsdir(toname)) (void) remove(toname); diff --git a/tzcode-zic.diff b/tzcode-zic.diff index 50fd4b2..c35648c 100644 --- a/tzcode-zic.diff +++ b/tzcode-zic.diff @@ -1,6 +1,8 @@ ---- timezone-2013g.orig/zic.c -+++ timezone-2013g/zic.c -@@ -646,8 +646,10 @@ dolink(const char *const fromfield, cons +Index: timezone-2014b/zic.c +=================================================================== +--- timezone-2014b.orig/zic.c ++++ timezone-2014b/zic.c +@@ -674,8 +674,10 @@ dolink(const char *const fromfield, cons "../"); symlinkcontents = ecatalloc(symlinkcontents, t); result = symlink(symlinkcontents, toname); diff --git a/tzcode2014a.tar.gz b/tzcode2014a.tar.gz deleted file mode 100644 index fc575a5..0000000 --- a/tzcode2014a.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05b93ba541b167a4c10f2e81a7baf972c24ff12db27d85f6c2dd328443c4d3f5 -size 174391 diff --git a/tzcode2014b.tar.gz b/tzcode2014b.tar.gz new file mode 100644 index 0000000..c537ee6 --- /dev/null +++ b/tzcode2014b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5dad3b0c7880e3fc030f87354b93776d9c0e761a56f363d917ab02e1754a78b +size 175361 diff --git a/tzdata-china.diff b/tzdata-china.diff index 7d922c5..d89e7af 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -1,5 +1,7 @@ ---- timezone-2013g.orig/asia -+++ timezone-2013g/asia +Index: timezone-2014b/asia +=================================================================== +--- timezone-2014b.orig/asia ++++ timezone-2014b/asia @@ -489,6 +489,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o 8:00 PRC C%sT @@ -10,8 +12,10 @@ # Hong Kong (Xianggang) # Milne gives 7:36:41.7; round this. ---- timezone-2013g.orig/backward -+++ timezone-2013g/backward +Index: timezone-2014b/backward +=================================================================== +--- timezone-2014b.orig/backward ++++ timezone-2014b/backward @@ -89,14 +89,13 @@ Link America/Mexico_City Mexico/General Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT @@ -28,9 +32,11 @@ Link Asia/Seoul ROK Link Asia/Singapore Singapore Link Europe/Istanbul Turkey ---- timezone-2013g.orig/zone.tab -+++ timezone-2013g/zone.tab -@@ -154,11 +154,12 @@ CK -2114-15946 Pacific/Rarotonga +Index: timezone-2014b/zone.tab +=================================================================== +--- timezone-2014b.orig/zone.tab ++++ timezone-2014b/zone.tab +@@ -155,11 +155,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 diff --git a/tzdata2014a.tar.gz b/tzdata2014a.tar.gz deleted file mode 100644 index e0f2f46..0000000 --- a/tzdata2014a.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7cff254ce85e11b21c994b284bccd1e12ecda9dadf947fbb32e1912fd520e8b1 -size 219826 diff --git a/tzdata2014b.tar.gz b/tzdata2014b.tar.gz new file mode 100644 index 0000000..7c66259 --- /dev/null +++ b/tzdata2014b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1e1f3e0c253a8ac0b35ffe27ef95f6366c37beb953391806cd922efce2b1cb5 +size 220771