From 8afba80701080e5e450f17c8d654332c04f14b75dbefed150b8e72d3d3a52ea1 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 8 Jul 2013 17:25:02 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=110

---
 iso3166-uk.diff      |  2 +-
 tzcode-symlink.patch | 18 +++++++++---------
 tzcode-zic.diff      |  2 +-
 tzdata-china.diff    |  8 +++++++-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/iso3166-uk.diff b/iso3166-uk.diff
index 607e0d6..bd8c653 100644
--- a/iso3166-uk.diff
+++ b/iso3166-uk.diff
@@ -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
diff --git a/tzcode-symlink.patch b/tzcode-symlink.patch
index 7b0e033..b3c179b 100644
--- a/tzcode-symlink.patch
+++ b/tzcode-symlink.patch
@@ -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);
diff --git a/tzcode-zic.diff b/tzcode-zic.diff
index 60e0fd8..85c6f85 100644
--- a/tzcode-zic.diff
+++ b/tzcode-zic.diff
@@ -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);
diff --git a/tzdata-china.diff b/tzdata-china.diff
index 8ffd7a1..139e5cd 100644
--- a/tzdata-china.diff
+++ b/tzdata-china.diff
@@ -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