forked from pool/timezone
Markéta Machová
2932caf501
* Revised predictions for Morocco's changes starting in 2023. * Canada's Yukon changes to -07 on 2020-11-01, not 2020-03-08. * Macquarie Island has stayed in sync with Tasmania since 2011. * Casey, Antarctica is at +08 in winter and +11 in summer. * zic no longer supports -y, nor the TYPE field of Rules. - Rebased timezone-2018f-bsc1112310.patch - Fixup tzdata-china.diff: zone.tab and zone1970.tab MUST be tab delimited (boo#1176927). - timezone update 2020b (bsc#1177460) * Revised predictions for Morocco's changes starting in 2023. * Canada's Yukon changes to -07 on 2020-11-01, not 2020-03-08. * Macquarie Island has stayed in sync with Tasmania since 2011. * Casey, Antarctica is at +08 in winter and +11 in summer. * zic no longer supports -y, nor the TYPE field of Rules. - Rebased timezone-2018f-bsc1112310.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=255
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
From: Andreas Stieger <astieger@suse.com>
|
|
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-2020b/asia
|
|
===================================================================
|
|
--- timezone-2020b.orig/asia
|
|
+++ timezone-2020b/asia
|
|
@@ -2021,7 +2021,7 @@ Zone Asia/Jerusalem 2:20:54 - LMT 1880
|
|
|
|
# Rule NAME FROM TO - 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
|
|
|