Hello community, here is the log from the commit of package timezone for openSUSE:Factory checked in at 2013-10-02 13:34:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/timezone (Old) and /work/SRC/openSUSE:Factory/.timezone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "timezone" Changes: -------- --- /work/SRC/openSUSE:Factory/timezone/timezone-java.changes 2013-09-26 20:07:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.timezone.new/timezone-java.changes 2013-10-02 13:34:01.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 1 22:27:14 UTC 2013 - [email protected] + +- v2013g +- changes for Morocco, Asia/Tehran + +------------------------------------------------------------------- timezone.changes: same change Old: ---- tzcode2013f.tar.gz tzdata2013f.tar.gz New: ---- tzcode2013g.tar.gz tzdata2013g.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ --- /var/tmp/diff_new_pack.5Rq7E4/_old 2013-10-02 13:34:02.000000000 +0200 +++ /var/tmp/diff_new_pack.5Rq7E4/_new 2013-10-02 13:34:02.000000000 +0200 @@ -25,7 +25,7 @@ Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2013f +Version: 2013g Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz @@ -52,11 +52,11 @@ %setup -c -a 1 # COMMON-PREP-BEGIN # COMMON-PREP-BEGIN -%patch0 -%patch1 -%patch3 +%patch0 -p1 +%patch1 -p1 +%patch3 -p1 %if 0%{?suse_version} < 1220 -%patch4 +%patch4 -p1 %else %patch5 -p1 %endif ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.5Rq7E4/_old 2013-10-02 13:34:02.000000000 +0200 +++ /var/tmp/diff_new_pack.5Rq7E4/_new 2013-10-02 13:34:02.000000000 +0200 @@ -23,7 +23,7 @@ Url: http://www.iana.org/time-zones PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2013f +Version: 2013g Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz @@ -46,11 +46,11 @@ %prep %setup -q -c -a 1 # COMMON-PREP-BEGIN -%patch0 -%patch1 -%patch3 +%patch0 -p1 +%patch1 -p1 +%patch3 -p1 %if 0%{?suse_version} < 1220 -%patch4 +%patch4 -p1 %else %patch5 -p1 %endif ++++++ iso3166-uk.diff ++++++ --- /var/tmp/diff_new_pack.5Rq7E4/_old 2013-10-02 13:34:02.000000000 +0200 +++ /var/tmp/diff_new_pack.5Rq7E4/_new 2013-10-02 13:34:02.000000000 +0200 @@ -1,7 +1,5 @@ -Index: iso3166.tab -=================================================================== ---- iso3166.tab.orig -+++ iso3166.tab +--- timezone-2013g.orig/iso3166.tab ++++ timezone-2013g/iso3166.tab @@ -100,7 +100,7 @@ FM Micronesia FO Faroe Islands FR France ++++++ tzcode-symlink.patch ++++++ --- /var/tmp/diff_new_pack.5Rq7E4/_old 2013-10-02 13:34:02.000000000 +0200 +++ /var/tmp/diff_new_pack.5Rq7E4/_new 2013-10-02 13:34:02.000000000 +0200 @@ -1,8 +1,6 @@ -Index: timezone-2013d/zic.c -=================================================================== ---- timezone-2013d.orig/zic.c -+++ timezone-2013d/zic.c -@@ -110,7 +110,7 @@ static int addtype(zic_t gmtoff, const c +--- timezone-2013g.orig/zic.c ++++ timezone-2013g/zic.c +@@ -120,7 +120,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); @@ -11,7 +9,7 @@ static char ** getfields(char * buf); static zic_t gethms(const char * string, const char * errstrng, int signable); -@@ -557,7 +557,7 @@ _("%s: More than one -L option specified +@@ -575,7 +575,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 +18,7 @@ if (noise) for (j = 0; j < nlinks; ++j) if (strcmp(links[i].l_to, -@@ -566,17 +566,17 @@ _("%s: More than one -L option specified +@@ -584,17 +584,17 @@ _("%s: More than one -L option specified } if (lcltime != NULL) { eat("command line", 1); @@ -41,23 +39,23 @@ { register char * fromname; register char * toname; -@@ -601,15 +601,16 @@ dolink(const char *const fromfield, cons +@@ -619,15 +619,16 @@ dolink(const char *const fromfield, cons */ if (!itsdir(toname)) (void) remove(toname); -- if (link(fromname, toname) != 0) { -+ if (defaultsymlink || link(fromname, toname) != 0) { +- if (link(fromname, toname) != 0 ++ if (defaultsymlink || link(fromname, toname) != 0 + && access(fromname, F_OK) == 0 && !itsdir(fromname)) { int result; if (mkdirs(toname) != 0) exit(EXIT_FAILURE); - result = link(fromname, toname); -+ if (!defaultsymlink) -+ result = link(fromname, toname); - #if HAVE_SYMLINK -- if (result != 0 && -+ if ((defaultsymlink || (!defaultsymlink && result != 0)) && - access(fromname, F_OK) == 0 && - !itsdir(fromname)) { - const char *s = tofield; +- if (result != 0) { ++ if (!defaultsymlink) result = link(fromname, toname); ++ ++ if ((defaultsymlink || (!defaultsymlink && result != 0))) { + const char *s = fromfield; + const char *t; + register char * symlinkcontents = NULL; ++++++ tzcode-zic.diff ++++++ --- /var/tmp/diff_new_pack.5Rq7E4/_old 2013-10-02 13:34:02.000000000 +0200 +++ /var/tmp/diff_new_pack.5Rq7E4/_new 2013-10-02 13:34:02.000000000 +0200 @@ -1,16 +1,13 @@ -Index: zic.c -=================================================================== ---- zic.c.orig -+++ zic.c -@@ -624,8 +624,10 @@ dolink(const char *const fromfield, cons - fromname); - result = symlink(symlinkcontents, - toname); +--- timezone-2013g.orig/zic.c ++++ timezone-2013g/zic.c +@@ -646,8 +646,10 @@ dolink(const char *const fromfield, cons + "../"); + symlinkcontents = ecatalloc(symlinkcontents, t); + 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 free(symlinkcontents); } - #endif /* HAVE_SYMLINK */ + if (result != 0) { ++++++ tzdata-china.diff ++++++ --- /var/tmp/diff_new_pack.5Rq7E4/_old 2013-10-02 13:34:02.000000000 +0200 +++ /var/tmp/diff_new_pack.5Rq7E4/_new 2013-10-02 13:34:02.000000000 +0200 @@ -1,5 +1,5 @@ ---- asia.orig -+++ asia +--- timezone-2013g.orig/asia ++++ timezone-2013g/asia @@ -489,6 +489,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o 8:00 PRC C%sT @@ -10,8 +10,8 @@ # Hong Kong (Xianggang) # Milne gives 7:36:41.7; round this. ---- backward.orig -+++ backward +--- timezone-2013g.orig/backward ++++ timezone-2013g/backward @@ -89,14 +89,13 @@ Link America/Mexico_City Mexico/General Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT @@ -28,8 +28,8 @@ Link Asia/Seoul ROK Link Asia/Singapore Singapore Link Europe/Istanbul Turkey ---- zone.tab.orig -+++ zone.tab +--- timezone-2013g.orig/zone.tab ++++ timezone-2013g/zone.tab @@ -154,11 +154,12 @@ CK -2114-15946 Pacific/Rarotonga CL -3327-07040 America/Santiago most locations CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
