testing/timezone
SHA256
3
0
Fork 0
forked from pool/timezone
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=110

Browse Source
This commit is contained in:
Dirk Mueller 2013-07-08 17:25:02 +00:00 committed by Git OBS Bridge
parent 46254784b1
commit 8afba80701
4 changed files with 18 additions and 12 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.orig
+++ iso3166.tab +++ iso3166.tab
@@ -101,7 +101,7 @@ FM Micronesia @@ -100,7 +100,7 @@ FM Micronesia
FO Faroe Islands FO Faroe Islands
FR France FR France
GA Gabon GA Gabon

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

2
tzcode-zic.diff
View File

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

8
tzdata-china.diff
View File

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