diff --git a/timezone-2018f-bsc1112310.patch b/timezone-2018f-bsc1112310.patch new file mode 100644 index 0000000..364ce78 --- /dev/null +++ b/timezone-2018f-bsc1112310.patch @@ -0,0 +1,33 @@ +From: Andreas Stieger +References: https://bugzilla.suse.com/show_bug.cgi?id=1112310 +Summary: avoid timezone-java build failures +Date: Thu, 18 Oct 2018 13:19:51 +0000 + +javazic is unable to parse the time zone data contained in 2018f: +https://github.com/eggert/tz/compare/2018e...2018f#diff-cffe819d4413b95dd8c35c0085930789R1656 + +- Rule Japan 1948 1951 - Sep Sun>=9 0:00 0 S ++ Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S + +Base:System/timezone (timezone-java.spec) fails with: + +[ 16s] + java -jar /usr/share/java/tzdb.jar -srcdir . -dstfile javazi/tzdb.dat africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera systemv /usr/share/tzdb/tzdata_jdk/gmt /usr/share/tzdb/tzdata_jdk/jdk11_backward +[ 16s] Failed: java.lang.Exception: Failed while parsing file './asia' on line 1659 'Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S' +[ 16s] java.lang.Exception: Failed while parsing file './asia' on line 1659 'Rule Japan 1948 1951 - Sep Sat>=8 25:00 0S' + +The bug is actually in Java. Use an alternative format to fix build. + + +Index: timezone-2018f/asia +=================================================================== +--- timezone-2018f.orig/asia 2018-10-18 15:18:13.461299301 +0200 ++++ timezone-2018f/asia 2018-10-18 15:23:20.330642692 +0200 +@@ -1657,7 +1657,7 @@ Zone Asia/Jerusalem 2:20:54 - LMT 1880 + + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule Japan 1948 only - May Sat>=1 24:00 1:00 D +-Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S ++Rule Japan 1948 1951 - Sep Sun>=9 1:00 0 S + Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D + Rule Japan 1950 1951 - May Sat>=1 24:00 1:00 D + diff --git a/timezone-java.changes b/timezone-java.changes index cc6d438..376c60d 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Sat Oct 27 12:20:44 UTC 2018 - astieger@suse.com + +- timezone update 2018g: + * Morocco switches to permanent +01 on 2018-10-27 (bsc#1113554) + * code fixes for zic on 32 bit + +------------------------------------------------------------------- +Thu Oct 18 13:28:04 UTC 2018 - astieger@suse.com + +- Avoid build failures of timezone-java with javazic SLE/Leap 15 + by using an alternative notation for a 1948-1951 DST transition + in Japan. add timezone-2018f-bsc1112310.patch, fixes boo#1112310 + +------------------------------------------------------------------- +Thu Oct 18 07:56:09 UTC 2018 - astieger@suse.com + +- timezone update 2018f: + * Volgograd moves from +03 to +04 on 2018-10-28. + * Fiji ends DST 2019-01-13, not 2019-01-20. + * Most of Chile changes DST dates, effective 2019-04-06 + (bsc#1104700) + * Corrections to past timestamps of DST transitions + * Use "PST" and "PDT" for Philippine time + * minor code changes to zic handling of the TZif format + * documentation updates + ------------------------------------------------------------------- Tue May 22 15:45:39 UTC 2018 - astieger@suse.com diff --git a/timezone-java.spec b/timezone-java.spec index 896a5d7..864e569 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -23,9 +23,9 @@ BuildRequires: tzdb Summary: Time Zone Descriptions # COMMON-BEGIN # COMMON-BEGIN -License: BSD-3-Clause and SUSE-Public-Domain +License: BSD-3-Clause AND SUSE-Public-Domain Group: System/Base -Version: 2018e +Version: 2018g Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz @@ -35,6 +35,7 @@ Source4: %{name}.keyring Source5: %{name}.changes Patch0: tzdata-china.diff Patch3: iso3166-uk.diff +Patch4: timezone-2018f-bsc1112310.patch # COMMON-END # COMMON-END Url: https://www.iana.org/time-zones @@ -57,6 +58,7 @@ package is intended for Java Virtual Machine based on OpenJDK. # COMMON-PREP-BEGIN %patch0 -p1 %patch3 -p1 +%patch4 -p1 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358] # COMMON-PREP-END # COMMON-PREP-END diff --git a/timezone.changes b/timezone.changes index cc6d438..376c60d 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Sat Oct 27 12:20:44 UTC 2018 - astieger@suse.com + +- timezone update 2018g: + * Morocco switches to permanent +01 on 2018-10-27 (bsc#1113554) + * code fixes for zic on 32 bit + +------------------------------------------------------------------- +Thu Oct 18 13:28:04 UTC 2018 - astieger@suse.com + +- Avoid build failures of timezone-java with javazic SLE/Leap 15 + by using an alternative notation for a 1948-1951 DST transition + in Japan. add timezone-2018f-bsc1112310.patch, fixes boo#1112310 + +------------------------------------------------------------------- +Thu Oct 18 07:56:09 UTC 2018 - astieger@suse.com + +- timezone update 2018f: + * Volgograd moves from +03 to +04 on 2018-10-28. + * Fiji ends DST 2019-01-13, not 2019-01-20. + * Most of Chile changes DST dates, effective 2019-04-06 + (bsc#1104700) + * Corrections to past timestamps of DST transitions + * Use "PST" and "PDT" for Philippine time + * minor code changes to zic handling of the TZif format + * documentation updates + ------------------------------------------------------------------- Tue May 22 15:45:39 UTC 2018 - astieger@suse.com diff --git a/timezone.spec b/timezone.spec index 9fe9669..32ddf72 100644 --- a/timezone.spec +++ b/timezone.spec @@ -18,12 +18,12 @@ Name: timezone Summary: Time Zone Descriptions -License: BSD-3-Clause and SUSE-Public-Domain +License: BSD-3-Clause AND SUSE-Public-Domain Group: System/Base Url: http://www.iana.org/time-zones PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2018e +Version: 2018g Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz @@ -33,6 +33,7 @@ Source4: %{name}.keyring Source5: %{name}.changes Patch0: tzdata-china.diff Patch3: iso3166-uk.diff +Patch4: timezone-2018f-bsc1112310.patch # COMMON-END BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,6 +51,7 @@ can select an appropriate time zone for your system with YaST. # COMMON-PREP-BEGIN %patch0 -p1 %patch3 -p1 +%patch4 -p1 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358] # COMMON-PREP-END diff --git a/tzcode2018e.tar.gz b/tzcode2018e.tar.gz deleted file mode 100644 index 996ace1..0000000 --- a/tzcode2018e.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca340cf20e80b699d6e5c49b4ba47361b3aa681f06f38a0c88a8e8308c00ebce -size 231732 diff --git a/tzcode2018e.tar.gz.asc b/tzcode2018e.tar.gz.asc deleted file mode 100644 index 02c375a..0000000 --- a/tzcode2018e.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJa6V9nAAoJEO2X6Q5iqn40r+EQAJSt3ap8G8swYPzBg6TstckZ -tOxrDcGlRu4km6jzIhHelOwj2Sxw8X/0JyRc09xbbXGE/mv35DrzKC8ijfazu9pg -Mr4eOclfFGq8l48aRag86hR33k62K84Xdl0WrwVFVefhlsRel9i6lXnBFcmgHl/C -vSwJXyrZ2DgvZH88B6j8qnYkw/BMbsTKLM1L/3EHxKZqq/TCHS19Z1XbbkF6mm/u -73aHHmXEnpSVol+3aekEKuS+PSdc+loYaAMvibBJ34ci2bc1X1HkOPF30dRSTETW -pVtKXp1qFtmHRR07I28l7/jEzmI+XPheCswhOKowWqKe59tA2CTiFnkhuBQUmoZS -XDjKpcgvrad9RSES1aVAfVn2iCx78Inu0W8UIWZ/eiMOh0taQH3n7K1KBnLwCEKd -rAB9ummGRK787XJEe2/xnH/h0lilU7Ye6EddNwuGf5Q3PlS9brDov66dnIUWi76L -uPRTufummczt6XcA9YL0zEhwvAzjSSqQzoga7mXBKSIwakRoKXCIoux+EdQOWNOy -/VUMH5NIkND+kRcRdqTXs93Whu7SCV14DKi5j1LL39YC8nqGi0q3u8wndm22AhCr -ZR9uMv1Qq1iCXb09sIBfdi7bf0S8348jz1deb/d7jgJ4ISBR7v8UiR3Z/JO8hiPR -QSP93j37rjAsFyBSWMxq -=knlj ------END PGP SIGNATURE----- diff --git a/tzcode2018g.tar.gz b/tzcode2018g.tar.gz new file mode 100644 index 0000000..fe2c424 --- /dev/null +++ b/tzcode2018g.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa53f4fb6570f02081be61dc11ade19ea5a280c23822a5b4016ce0c6be23c427 +size 241541 diff --git a/tzcode2018g.tar.gz.asc b/tzcode2018g.tar.gz.asc new file mode 100644 index 0000000..76ad421 --- /dev/null +++ b/tzcode2018g.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAlvT+u0ACgkQ7ZfpDmKq +fjRxJA//fwP+H4oNXlOYDUrDlPjDF5tKhouAkZ3FTy85cagjyfd6g6oFo8RIYyYV +QqFR+mZd35W1xoWTf5cDcFLrmbX2PyrwBagDjQM9kf3xQ92pyfaGVm4C9kJOJ42q +gYEIzO2LS25ybYaSt0OnguvkcghNG/bL27ivnwsxpq0Hv1J6Z2xSsH2rXh5dtGAZ +gjQhYRoi6nWJXxOW+zHxNjEin/d2xaRTFa1UIjovQu+f01+9CWwpvSWrA61NlWcI +IVnboUT7nrTRQE05TqkKtzL8Yoc1gnxLpIDJ6FwOhdPLcQy4keU4SnxuA8mCDcir +tBsR/5K/JU6EgVCoylR+c2GyncPV+9jpXzfImW9EFjNFga32ZwcVud1hXM6/iRKc +oDyTp95cRJpemSkt5EqiMfPgokhd4ZiHrN9y7hn25hPcO5UhfmiJSA0tquIJq/Q5 +ryhYZJltdI5ASdnr2YpFhwyHUT1xW5uzF1l/XszydT5UXSgLTd+RiPY7MC+mKn+i +rglUUpQ6vbcZvHeeab6k3ZDuGv3N1CR0u+jaEU6Ih6IThxHYD9EjoT7YwCVAjbcR +SsT32TAIcGd6RfRdnqUAytzhgqgBvF4jmQGIk56yQ08woH1bZjjGRcdqHUe96y7R +giUOVmIch9/vcAOIFkazqMnQupY+mA3Bd/pCfRPrLF3jk4t4xco= +=hWDq +-----END PGP SIGNATURE----- diff --git a/tzdata-china.diff b/tzdata-china.diff index 2ab76f6..a9bd837 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -1,10 +1,10 @@ -Index: timezone-2017a/asia +Index: timezone-2018f/asia =================================================================== ---- timezone-2017a.orig/asia 2017-03-01 09:14:03.177279465 +0100 -+++ timezone-2017a/asia 2017-03-01 09:14:05.141295116 +0100 -@@ -512,6 +512,10 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: +--- timezone-2018f.orig/asia 2018-10-03 02:21:28.000000000 +0200 ++++ timezone-2018f/asia 2018-10-18 10:01:30.657962333 +0200 +@@ -566,6 +566,10 @@ Rule PRC 1987 1991 - Apr Sun>=11 2:00 1 Zone Asia/Shanghai 8:05:43 - LMT 1901 - 8:00 Shang C%sT 1949 + 8:00 Shang C%sT 1949 May 28 8:00 PRC C%sT + +# Nowadays, China Standard Time is known as "Beijing Time" @@ -13,11 +13,11 @@ Index: timezone-2017a/asia # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi # / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.) Zone Asia/Urumqi 5:50:20 - LMT 1928 -Index: timezone-2017a/backward +Index: timezone-2018f/backward =================================================================== ---- timezone-2017a.orig/backward 2017-03-01 09:14:05.141295116 +0100 -+++ timezone-2017a/backward 2017-03-01 09:15:31.921986670 +0100 -@@ -95,7 +95,7 @@ Link America/Mexico_City Mexico/General +--- timezone-2018f.orig/backward 2018-07-16 19:16:52.000000000 +0200 ++++ timezone-2018f/backward 2018-10-18 10:01:30.657962333 +0200 +@@ -99,7 +99,7 @@ Link America/Mexico_City Mexico/General Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo @@ -26,10 +26,10 @@ Index: timezone-2017a/backward Link Pacific/Honolulu Pacific/Johnston Link Pacific/Pohnpei Pacific/Ponape Link Pacific/Pago_Pago Pacific/Samoa -Index: timezone-2017a/zone.tab +Index: timezone-2018f/zone.tab =================================================================== ---- timezone-2017a.orig/zone.tab 2017-03-01 09:14:03.177279465 +0100 -+++ timezone-2017a/zone.tab 2017-03-01 09:14:05.141295116 +0100 +--- timezone-2018f.orig/zone.tab 2018-06-27 20:24:09.000000000 +0200 ++++ timezone-2018f/zone.tab 2018-10-18 10:01:30.657962333 +0200 @@ -145,6 +145,7 @@ CL -3327-07040 America/Santiago Chile (m CL -5309-07055 America/Punta_Arenas Region of Magallanes CL -2709-10926 Pacific/Easter Easter Island diff --git a/tzdata2018e.tar.gz b/tzdata2018e.tar.gz deleted file mode 100644 index 45ac34c..0000000 --- a/tzdata2018e.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b288e5926841a4cb490909fe822d85c36ae75538ad69baf20da9628b63b692e -size 353953 diff --git a/tzdata2018e.tar.gz.asc b/tzdata2018e.tar.gz.asc deleted file mode 100644 index f2bd133..0000000 --- a/tzdata2018e.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJa6V9nAAoJEO2X6Q5iqn40qYUQAI21DF4x+Qr9uhMf5UL3u/UI -BnLTeDqc4t1oLbuuJsbtgausc/m6EIgo2j9+uadXefnguP4fwKHJ2doReuRZ3njI -hGnqP2+yCfTRNrZYBU3p6U+/OJq8r/UBsn9aGxNStcZHe6FswnxXWlzpRNbPdNBC -nGeYMs2HOQjcdG08BF1sjGm4FC/NS6bugNhs0EcrMLaVa+c0keRWNg9o7Y/SvrZB -awFAMz4LhOog2qxhGWtFgSVRAAj5aEDqugOXZL27VszgGPexiAaMCFyQARIHigIw -959D7RYmpeNuEeP6XbzGFgDO6aMbxahoUpP9cCOUI6qKShtDKnY2XkjPmVQiAfjZ -zvpsE1dYbWyVTWqWhWL3z0lPCFN6B4eneY6UXY/KtENRl1jEafKN5/7JqKOMBSRo -umE1Jy6qSSz5jLuz5pX59iOXWZETIlwtAW6lKe2s6l9xWPL9R8xXoPvbQRadqDxB -uANcGZSrKD1jKuybPJa/6BZRF+FlldCkZVVKSSdXuPLF1HhohlvFZqi1WPmWvGd+ -s/1+3OhWzB4BHyrp3Wbtj+ZwCtg9UVbJLBM2bgL9nGEyv/1XSxgLJEp3rneIMpJv -AMK8rr3XehXLDkXAfx68Mzs3F4lYEdXk6y9f9ZsVj+IdBotwzzjJWeCfnlmJM52y -8cCrPGUjdneFidV9OZ+J -=4LFO ------END PGP SIGNATURE----- diff --git a/tzdata2018g.tar.gz b/tzdata2018g.tar.gz new file mode 100644 index 0000000..e001f44 --- /dev/null +++ b/tzdata2018g.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02dfde534872f6513ae4553a3388fdae579441e31b862ea99170dfc447f46a16 +size 366408 diff --git a/tzdata2018g.tar.gz.asc b/tzdata2018g.tar.gz.asc new file mode 100644 index 0000000..b3790e2 --- /dev/null +++ b/tzdata2018g.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAlvT+vsACgkQ7ZfpDmKq +fjSOeQ/+KHzhT6GWZeqOAKj/AjyKK9KnL4gPh4MhsiI+V3z3/y+4ECvvee7ixbHI +NQ33B4gRBzlbWWYnHw4Yq6Fm9RihnHOVj8XT/BM56YFESdfTQxOHsqsY+n3byGND +Q+luSH0YC/S4mLxqS/vxHyT+nU2D4sS6UCmMIzW62fixJX5S2HAC3s7WoQkRXRDg +ItaQvU42r9qs67C4M8q2+A9H7anUIhIE5KqZcPKmF7AMAdGnY4ZWpKb/uyxwzi58 +pctIhzSGkB8im2m8QgDTrYsflOgADw3j/dKuYnyu4J0aniWC3qp7nJFPr5uTDaW7 +TsWtaZCaUhytlsg+E0zebTURV2ziVNf52X58U9K3kUnnZqOxxZUeQWACmdjCc0kO +yg9P1idYz1XTC4c0oik/YTt5OMkpkyFNqTaueSSQ3dpD0vc63GbGrDbMSPfa6bOx +EOHvR/IqcNKCewfnv7a8h7y+5JX52gijL5hZjkpAU/XBCMdA3Pd/vZ5n3UaSbnC1 +MNmZgsnJjBKVgaK8KHTuhCGigtDFc6TQethUQlKKWLr41P5RWrdmrhmMZIP0VBt5 +4X0Kf7mKK2X/lsI33FCpzUbtnV093L1bLe6Vt74r01JBWUxeEy2BHdn+KM/CqHkH +LTj0FmVFUWzvG7kqzrRgjJ5CnLUSnf/T1Gl6PgeKzMePChptyQE= +=kUHt +-----END PGP SIGNATURE-----