From 11f43c79b2600a3096ac63dde8935bf4f36d0a68786b490637224cdf342d1d41 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sat, 27 Oct 2012 12:44:04 +0000
Subject: [PATCH] refresh patches

OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=91
---
 iso3166-uk.diff      |  8 +++++---
 tzcode-ksh.diff      |  2 +-
 tzcode-symlink.patch | 37 +++++++++++++++++--------------------
 tzcode-zic.diff      |  7 ++++---
 tzdata-china.diff    |  4 ++--
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/iso3166-uk.diff b/iso3166-uk.diff
index a452c5e..607e0d6 100644
--- a/iso3166-uk.diff
+++ b/iso3166-uk.diff
@@ -1,6 +1,8 @@
---- iso3166.tab~	2009-09-15 00:34:18.941351000 +0200
-+++ iso3166.tab	2009-09-15 00:34:31.010318000 +0200
-@@ -98,7 +98,7 @@
+Index: iso3166.tab
+===================================================================
+--- iso3166.tab.orig
++++ iso3166.tab
+@@ -101,7 +101,7 @@ FM	Micronesia
  FO	Faroe Islands
  FR	France
  GA	Gabon
diff --git a/tzcode-ksh.diff b/tzcode-ksh.diff
index 4b282b9..77e192d 100644
--- a/tzcode-ksh.diff
+++ b/tzcode-ksh.diff
@@ -2,7 +2,7 @@ Index: Makefile
 ===================================================================
 --- Makefile.orig
 +++ Makefile
-@@ -376,6 +376,7 @@ date:		$(DATEOBJS)
+@@ -385,6 +385,7 @@ date:		$(DATEOBJS)
  
  tzselect:	tzselect.ksh
  		sed \
diff --git a/tzcode-symlink.patch b/tzcode-symlink.patch
index f931b32..7b0e033 100644
--- a/tzcode-symlink.patch
+++ b/tzcode-symlink.patch
@@ -1,17 +1,17 @@
-Index: timezone-2012e/zic.c
+Index: timezone-2012h/zic.c
 ===================================================================
---- timezone-2012e.orig/zic.c
-+++ timezone-2012e/zic.c
-@@ -113,7 +113,7 @@ static void	associate(void);
- static int	ciequal(const char * ap, const char * bp);
- static void	convert(long val, char * buf);
- static void	convert64(zic_t val, char * buf);
+--- timezone-2012h.orig/zic.c
++++ timezone-2012h/zic.c
+@@ -110,7 +110,7 @@ static int	addtype(long gmtoff, const ch
+ 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 void	doabbr(char * abbr, const char * format,
- 			const char * letters, int isdst, int doquotes);
- static void	eat(const char * name, int num);
-@@ -595,7 +595,7 @@ _("%s: More than one -L option specified
+ 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
  	*/
  	for (i = 0; i < nlinks; ++i) {
  		eat(links[i].l_filename, links[i].l_linenum);
@@ -20,31 +20,28 @@ Index: timezone-2012e/zic.c
  		if (noise)
  			for (j = 0; j < nlinks; ++j)
  				if (strcmp(links[i].l_to,
-@@ -604,19 +604,20 @@ _("%s: More than one -L option specified
+@@ -567,17 +567,17 @@ _("%s: More than one -L option specified
  	}
  	if (lcltime != NULL) {
  		eat("command line", 1);
 -		dolink(lcltime, TZDEFAULT);
-+		dolink(lcltime, TZDEFAULT,TRUE);
++		dolink(lcltime, TZDEFAULT, TRUE);
  	}
  	if (psxrules != NULL) {
  		eat("command line", 1);
 -		dolink(psxrules, TZDEFRULES);
-+		dolink(psxrules, TZDEFRULES,FALSE);
++		dolink(psxrules, TZDEFRULES, FALSE);
  	}
  	return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
  }
  
  static void
--dolink(fromfield, tofield)
-+dolink(fromfield, tofield, defaultsymlink)
- const char * const	fromfield;
- const char * const	tofield;
-+const int		defaultsymlink;
+-dolink(const char *const fromfield, const char *const tofield)
++dolink(const char *const fromfield, const char *const tofield, int defaultsymlink)
  {
  	register char *	fromname;
  	register char *	toname;
-@@ -641,15 +642,16 @@ const char * const	tofield;
+@@ -602,15 +602,16 @@ dolink(const char *const fromfield, cons
  	*/
  	if (!itsdir(toname))
  		(void) remove(toname);
diff --git a/tzcode-zic.diff b/tzcode-zic.diff
index 15cd86e..60e0fd8 100644
--- a/tzcode-zic.diff
+++ b/tzcode-zic.diff
@@ -2,14 +2,15 @@ Index: zic.c
 ===================================================================
 --- zic.c.orig
 +++ zic.c
-@@ -665,8 +665,10 @@ const char * const	tofield;
+@@ -625,8 +625,10 @@ dolink(const char *const fromfield, cons
  					fromname);
  				result = symlink(symlinkcontents,
  					toname);
 +#if 0
  				if (result == 0)
- warning(_("hard link failed, symbolic link used"));
+-warning(_("hard link failed, symbolic link used"));
++                                    warning(_("hard link failed, symbolic link used"));
 +#endif
- 				ifree(symlinkcontents);
+ 				free(symlinkcontents);
  		}
  #endif /* HAVE_SYMLINK */
diff --git a/tzdata-china.diff b/tzdata-china.diff
index c4ca7cb..2f94088 100644
--- a/tzdata-china.diff
+++ b/tzdata-china.diff
@@ -2,7 +2,7 @@ Index: asia
 ===================================================================
 --- asia.orig
 +++ asia
-@@ -531,6 +531,9 @@ Zone	Asia/Kashgar	5:03:56	-	LMT	1928 # o
+@@ -547,6 +547,9 @@ Zone	Asia/Kashgar	5:03:56	-	LMT	1928 # o
  # The Japanese surrender of Hong Kong was signed 1945-09-15.
  # For lack of anything better, use start of those days as the transition times.
  
@@ -16,7 +16,7 @@ Index: backward
 ===================================================================
 --- backward.orig
 +++ backward
-@@ -88,14 +88,13 @@ Link	America/Mexico_City	Mexico/General
+@@ -87,14 +87,13 @@ Link	America/Mexico_City	Mexico/General
  Link	Pacific/Auckland	NZ
  Link	Pacific/Chatham		NZ-CHAT
  Link	America/Denver		Navajo