diff --git a/iso3166-uk.diff b/iso3166-uk.diff index bd8c653..dee6cb7 100644 --- a/iso3166-uk.diff +++ b/iso3166-uk.diff @@ -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 diff --git a/timezone-java.changes b/timezone-java.changes index ad86048..e8e001c 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 1 22:27:14 UTC 2013 - crrodriguez@opensuse.org + +- v2013g +- changes for Morocco, Asia/Tehran + ------------------------------------------------------------------- Thu Sep 26 01:07:52 UTC 2013 - crrodriguez@opensuse.org diff --git a/timezone-java.spec b/timezone-java.spec index 9c8bf11..0e3e874 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: 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 @@ package is intended for Java Virtual Machine based on OpenJDK. %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 diff --git a/timezone.changes b/timezone.changes index ad86048..e8e001c 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 1 22:27:14 UTC 2013 - crrodriguez@opensuse.org + +- v2013g +- changes for Morocco, Asia/Tehran + ------------------------------------------------------------------- Thu Sep 26 01:07:52 UTC 2013 - crrodriguez@opensuse.org diff --git a/timezone.spec b/timezone.spec index 49981c3..1ef2ce5 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: 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 @@ can select an appropriate time zone for your system with YaST. %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 diff --git a/tzcode-symlink.patch b/tzcode-symlink.patch index b3c179b..6e04bfa 100644 --- a/tzcode-symlink.patch +++ b/tzcode-symlink.patch @@ -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 @@ Index: timezone-2013d/zic.c 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 @@ Index: timezone-2013d/zic.c 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 @@ Index: timezone-2013d/zic.c { 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; diff --git a/tzcode-zic.diff b/tzcode-zic.diff index 85c6f85..50fd4b2 100644 --- a/tzcode-zic.diff +++ b/tzcode-zic.diff @@ -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) { diff --git a/tzcode2013f.tar.gz b/tzcode2013f.tar.gz deleted file mode 100644 index 9b59a55..0000000 --- a/tzcode2013f.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ffd83e06f61f7854827cd7ac34239ef29c3d5ec760d7216f06c68f1b1d805ea3 -size 170365 diff --git a/tzcode2013g.tar.gz b/tzcode2013g.tar.gz new file mode 100644 index 0000000..7b93598 --- /dev/null +++ b/tzcode2013g.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7c358b459bb65cfab7b7bdd6a9689233fc393f1f9fdf4f0f46ca7dac5a9587b +size 171550 diff --git a/tzdata-china.diff b/tzdata-china.diff index d9a21b4..7d922c5 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -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 diff --git a/tzdata2013f.tar.gz b/tzdata2013f.tar.gz deleted file mode 100644 index 16ac8d8..0000000 --- a/tzdata2013f.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b72ed29bea75e0b59cbd3f575db0aac62f96a2a36e652725f674a92a95d4ada -size 223967 diff --git a/tzdata2013g.tar.gz b/tzdata2013g.tar.gz new file mode 100644 index 0000000..42dd2a2 --- /dev/null +++ b/tzdata2013g.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6cdd3998dcc732a6ae5e101e1394f9d4d6dff68bd48a8fb78c44c2b997d3a4f +size 226943