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/timezone-java.changes b/timezone-java.changes index 2b0bcb8..46ed8f2 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Oct 27 10:38:41 UTC 2012 - dmueller@suse.com + +- update to 2012h (bnc#787005): + * Samoa fall 2012 and later + * Palestine fall 2012 + * Bahia no longer has DST + * Tocantins has DST + * Israel has new DST rules next year + * Jordan stays on DST this winter + ------------------------------------------------------------------- Sat Sep 15 08:38:34 UTC 2012 - frank.lichtenheld@sophos.com diff --git a/timezone-java.spec b/timezone-java.spec index d529470..efda3ad 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: 2012f +Version: 2012h Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz @@ -37,7 +37,7 @@ Patch4: tzcode-link.diff Patch5: tzcode-symlink.patch # COMMON-END # COMMON-END -Url: http://www.iana.org/time-zones +Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils BuildArch: noarch Provides: tzdata-java = %{version}-%{release} diff --git a/timezone.changes b/timezone.changes index 2b0bcb8..46ed8f2 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Oct 27 10:38:41 UTC 2012 - dmueller@suse.com + +- update to 2012h (bnc#787005): + * Samoa fall 2012 and later + * Palestine fall 2012 + * Bahia no longer has DST + * Tocantins has DST + * Israel has new DST rules next year + * Jordan stays on DST this winter + ------------------------------------------------------------------- Sat Sep 15 08:38:34 UTC 2012 - frank.lichtenheld@sophos.com diff --git a/timezone.spec b/timezone.spec index 0cac4ed..5e81d4f 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: 2012f +Version: 2012h 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-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-link.diff b/tzcode-link.diff index 806175c..d51494e 100644 --- a/tzcode-link.diff +++ b/tzcode-link.diff @@ -1,6 +1,8 @@ ---- zic.c 2010-01-06 16:21:33.000000000 +0100 -+++ zic.c 2010-06-01 01:34:12.000000000 +0200 -@@ -614,6 +614,23 @@ +Index: zic.c +=================================================================== +--- zic.c.orig ++++ zic.c +@@ -576,6 +576,23 @@ _("%s: More than one -L option specified return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } @@ -22,9 +24,9 @@ +} + static void - dolink(fromfield, tofield) - const char * const fromfield; -@@ -649,6 +666,8 @@ + dolink(const char *const fromfield, const char *const tofield) + { +@@ -609,6 +626,8 @@ dolink(const char *const fromfield, cons exit(EXIT_FAILURE); result = link(fromname, toname); 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/tzcode2012f.tar.gz b/tzcode2012f.tar.gz deleted file mode 100644 index 18d0c3b..0000000 --- a/tzcode2012f.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f38a096ee1f6c6752946463fdeecf1f0bba422a3e5bdb2eff672d601407ad9d4 -size 135543 diff --git a/tzcode2012h.tar.gz b/tzcode2012h.tar.gz new file mode 100644 index 0000000..e86a757 --- /dev/null +++ b/tzcode2012h.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:711883468d59bd20a51faf2abd96219f1ba2390b903e55901c86159530d5bf39 +size 135077 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 diff --git a/tzdata2012f.tar.gz b/tzdata2012f.tar.gz deleted file mode 100644 index 26fafc1..0000000 --- a/tzdata2012f.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afe95a49a445ee55391d2d4beccd4be6d61a090d5d8069c407390ff1502c26cc -size 206404 diff --git a/tzdata2012h.tar.gz b/tzdata2012h.tar.gz new file mode 100644 index 0000000..5a488ac --- /dev/null +++ b/tzdata2012h.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65e53218eff4f71f8e7eaa0ae52aecec79e0ba186bd5badc27c099118d4cd065 +size 213675