From 75ae053f9bd5634cb3960a52394f1b55f100ecf63e0495732c5c86d4e0083c27 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Thu, 18 Oct 2018 13:32:15 +0000 Subject: [PATCH] - 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 - 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 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=233 --- timezone-2018f-bsc1112310.patch | 33 +++++++++++++++++++++++++++++++++ timezone-java.changes | 7 +++++++ timezone-java.spec | 2 ++ timezone.changes | 7 +++++++ timezone.spec | 2 ++ 5 files changed, 51 insertions(+) create mode 100644 timezone-2018f-bsc1112310.patch 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 316e09c..52e465e 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/timezone-java.spec b/timezone-java.spec index e5eaf43..3d19ec0 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -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 316e09c..52e465e 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/timezone.spec b/timezone.spec index 270aa1d..30accf8 100644 --- a/timezone.spec +++ b/timezone.spec @@ -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