Hello community, here is the log from the commit of package timezone for openSUSE:Factory checked in at 2012-10-29 20:13:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/timezone (Old) and /work/SRC/openSUSE:Factory/.timezone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "timezone", Maintainer is "dmuel...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/timezone/timezone-java.changes 2012-09-16 23:48:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.timezone.new/timezone-java.changes 2012-10-29 20:15:24.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Oct 27 10:38:41 UTC 2012 - dmuel...@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 + +------------------------------------------------------------------- timezone.changes: same change Old: ---- tzcode2012f.tar.gz tzdata2012f.tar.gz New: ---- tzcode2012h.tar.gz tzdata2012h.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ --- /var/tmp/diff_new_pack.YWIegJ/_old 2012-10-29 20:15:26.000000000 +0100 +++ /var/tmp/diff_new_pack.YWIegJ/_new 2012-10-29 20:15:26.000000000 +0100 @@ -25,7 +25,7 @@ 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 @@ 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} ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.YWIegJ/_old 2012-10-29 20:15:26.000000000 +0100 +++ /var/tmp/diff_new_pack.YWIegJ/_new 2012-10-29 20:15:26.000000000 +0100 @@ -23,7 +23,7 @@ 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 ++++++ iso3166-uk.diff ++++++ --- /var/tmp/diff_new_pack.YWIegJ/_old 2012-10-29 20:15:26.000000000 +0100 +++ /var/tmp/diff_new_pack.YWIegJ/_new 2012-10-29 20:15:26.000000000 +0100 @@ -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 ++++++ tzcode-ksh.diff ++++++ --- /var/tmp/diff_new_pack.YWIegJ/_old 2012-10-29 20:15:26.000000000 +0100 +++ /var/tmp/diff_new_pack.YWIegJ/_new 2012-10-29 20:15:26.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- Makefile.orig +++ Makefile -@@ -376,6 +376,7 @@ date: $(DATEOBJS) +@@ -385,6 +385,7 @@ date: $(DATEOBJS) tzselect: tzselect.ksh sed \ ++++++ tzcode-link.diff ++++++ --- /var/tmp/diff_new_pack.YWIegJ/_old 2012-10-29 20:15:26.000000000 +0100 +++ /var/tmp/diff_new_pack.YWIegJ/_new 2012-10-29 20:15:26.000000000 +0100 @@ -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); ++++++ tzcode-symlink.patch ++++++ --- /var/tmp/diff_new_pack.YWIegJ/_old 2012-10-29 20:15:26.000000000 +0100 +++ /var/tmp/diff_new_pack.YWIegJ/_new 2012-10-29 20:15:26.000000000 +0100 @@ -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 @@ 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); ++++++ tzcode-zic.diff ++++++ --- /var/tmp/diff_new_pack.YWIegJ/_old 2012-10-29 20:15:26.000000000 +0100 +++ /var/tmp/diff_new_pack.YWIegJ/_new 2012-10-29 20:15:26.000000000 +0100 @@ -2,14 +2,15 @@ =================================================================== --- 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 */ ++++++ tzdata-china.diff ++++++ --- /var/tmp/diff_new_pack.YWIegJ/_old 2012-10-29 20:15:26.000000000 +0100 +++ /var/tmp/diff_new_pack.YWIegJ/_new 2012-10-29 20:15:26.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- 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 @@ =================================================================== --- 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
