diff --git a/fat.patch b/fat.patch new file mode 100644 index 0000000..f9309e6 --- /dev/null +++ b/fat.patch @@ -0,0 +1,13 @@ +Index: timezone-2020d/Makefile +=================================================================== +--- timezone-2020d.orig/Makefile ++++ timezone-2020d/Makefile +@@ -386,7 +386,7 @@ ZIC= $(zic) $(ZFLAGS) + # To grow the files and work around older application bugs, append "-b fat"; + # see ZIC_BLOAT_DEFAULT above. + # See the zic man page for more about -b and -r. +-ZFLAGS= ++ZFLAGS=-b fat + + # How to use zic to install TZif files. + diff --git a/timezone-2018f-bsc1112310.patch b/timezone-2018f-bsc1112310.patch index 364ce78..320abe9 100644 --- a/timezone-2018f-bsc1112310.patch +++ b/timezone-2018f-bsc1112310.patch @@ -18,13 +18,13 @@ Base:System/timezone (timezone-java.spec) fails with: The bug is actually in Java. Use an alternative format to fix build. -Index: timezone-2018f/asia +Index: timezone-2020b/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 +--- timezone-2020b.orig/asia ++++ timezone-2020b/asia +@@ -2021,7 +2021,7 @@ Zone Asia/Jerusalem 2:20:54 - LMT 1880 - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + # 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 diff --git a/timezone-java.changes b/timezone-java.changes index f9b589c..3e71237 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,5 +1,45 @@ ------------------------------------------------------------------- -Sat Sep 12 04:09:14 UTC 2020 - Marguerite Su +Fri Oct 30 11:43:21 UTC 2020 - Marketa Calabkova + +- Add fat.patch to generate "fat" timezone files (was default before 2020b). + +------------------------------------------------------------------- +Fri Oct 23 09:24:02 UTC 2020 - Andreas Stieger + +- Adjust timezone-java.spec.in to avoid build failures when running + pre_checkin.sh + +------------------------------------------------------------------- +Thu Oct 22 07:08:35 UTC 2020 - Marketa Calabkova + +- timezone update 2020d + * Palestine ends DST earlier than predicted, on 2020-10-24. + +------------------------------------------------------------------- +Mon Oct 19 08:05:42 UTC 2020 - Marketa Calabkova + +- timezone update 2020c + * Fiji starts DST later than usual, on 2020-12-20. + +------------------------------------------------------------------- +Thu Oct 8 07:52:59 UTC 2020 - Marketa Calabkova + +- 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 + +------------------------------------------------------------------- +Thu Sep 24 15:02:08 UTC 2020 - Dominique Leuenberger + +- Fixup tzdata-china.diff: zone.tab and zone1970.tab MUST be tab + delimited (boo#1176927). + +------------------------------------------------------------------- +Sat Sep 12 04:08:38 UTC 2020 - Marguerite Su - modify tzdata-china.diff * systemd now reads zone1970.tab diff --git a/timezone-java.spec b/timezone-java.spec index 53a3a73..b98c37b 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -25,7 +25,7 @@ Summary: Time Zone Descriptions # COMMON-BEGIN License: BSD-3-Clause AND SUSE-Public-Domain Group: System/Base -Version: 2020a +Version: 2020d 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 @@ -40,11 +40,10 @@ Patch4: timezone-2018f-bsc1112310.patch # COMMON-END URL: https://www.iana.org/time-zones Requires(pre): filesystem, coreutils -BuildArch: noarch Provides: tzdata-java = %{version}-%{release} Provides: tzdata-java8 = %{version}-%{release} #!BuildIgnore: tzdata-java tzdata-java8 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description These are configuration files that describe available time zones - this @@ -69,15 +68,15 @@ echo "tzdata%{version}" >> VERSION # Java 6/7 data java -jar %{_javadir}/javazic.jar -V %{version} \ -d javazi \ - africa antarctica asia australasia europe northamerica pacificnew \ - southamerica backward etcetera systemv \ + africa antarctica asia australasia europe northamerica \ + southamerica backward etcetera \ %{_datadir}/javazic/tzdata_jdk/gmt \ %{_datadir}/javazic/tzdata_jdk/jdk11_backward # Java 8/9 data java -jar %{_javadir}/tzdb.jar \ -srcdir . -dstfile javazi/tzdb.dat \ - africa antarctica asia australasia europe northamerica pacificnew \ - southamerica backward etcetera systemv \ + africa antarctica asia australasia europe northamerica \ + southamerica backward etcetera \ %{_datadir}/tzdb/tzdata_jdk/gmt \ %{_datadir}/tzdb/tzdata_jdk/jdk11_backward diff --git a/timezone-java.spec.in b/timezone-java.spec.in index 24127de..d640fd7 100644 --- a/timezone-java.spec.in +++ b/timezone-java.spec.in @@ -1,7 +1,7 @@ # # spec file for package timezone-java # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,17 +21,16 @@ BuildRequires: java BuildRequires: javazic BuildRequires: tzdb Summary: Time Zone Descriptions -License: BSD-3-Clause and SUSE-Public-Domain +License: BSD-3-Clause AND SUSE-Public-Domain Group: System/Base # COMMON-BEGIN # COMMON-END -Url: https://www.iana.org/time-zones +URL: https://www.iana.org/time-zones Requires(pre): filesystem, coreutils -BuildArch: noarch Provides: tzdata-java = %{version}-%{release} Provides: tzdata-java8 = %{version}-%{release} #!BuildIgnore: tzdata-java tzdata-java8 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description These are configuration files that describe available time zones - this @@ -50,15 +49,15 @@ echo "tzdata%{version}" >> VERSION # Java 6/7 data java -jar %{_javadir}/javazic.jar -V %{version} \ -d javazi \ - africa antarctica asia australasia europe northamerica pacificnew \ - southamerica backward etcetera systemv \ + africa antarctica asia australasia europe northamerica \ + southamerica backward etcetera \ %{_datadir}/javazic/tzdata_jdk/gmt \ %{_datadir}/javazic/tzdata_jdk/jdk11_backward # Java 8/9 data java -jar %{_javadir}/tzdb.jar \ -srcdir . -dstfile javazi/tzdb.dat \ - africa antarctica asia australasia europe northamerica pacificnew \ - southamerica backward etcetera systemv \ + africa antarctica asia australasia europe northamerica \ + southamerica backward etcetera \ %{_datadir}/tzdb/tzdata_jdk/gmt \ %{_datadir}/tzdb/tzdata_jdk/jdk11_backward diff --git a/timezone.changes b/timezone.changes index 7d7803d..3e71237 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Fri Oct 30 11:43:21 UTC 2020 - Marketa Calabkova + +- Add fat.patch to generate "fat" timezone files (was default before 2020b). + +------------------------------------------------------------------- +Fri Oct 23 09:24:02 UTC 2020 - Andreas Stieger + +- Adjust timezone-java.spec.in to avoid build failures when running + pre_checkin.sh + +------------------------------------------------------------------- +Thu Oct 22 07:08:35 UTC 2020 - Marketa Calabkova + +- timezone update 2020d + * Palestine ends DST earlier than predicted, on 2020-10-24. + +------------------------------------------------------------------- +Mon Oct 19 08:05:42 UTC 2020 - Marketa Calabkova + +- timezone update 2020c + * Fiji starts DST later than usual, on 2020-12-20. + +------------------------------------------------------------------- +Thu Oct 8 07:52:59 UTC 2020 - Marketa Calabkova + +- 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 + ------------------------------------------------------------------- Thu Sep 24 15:02:08 UTC 2020 - Dominique Leuenberger diff --git a/timezone.spec b/timezone.spec index 194627e..ddfa629 100644 --- a/timezone.spec +++ b/timezone.spec @@ -22,7 +22,7 @@ License: BSD-3-Clause AND SUSE-Public-Domain Group: System/Base URL: http://www.iana.org/time-zones # COMMON-BEGIN -Version: 2020a +Version: 2020d 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 @@ Source5: %{name}.changes Patch0: tzdata-china.diff Patch3: iso3166-uk.diff Patch4: timezone-2018f-bsc1112310.patch +Patch5: fat.patch # COMMON-END BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,6 +52,7 @@ can select an appropriate time zone for your system with YaST. %patch0 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358] # COMMON-PREP-END @@ -66,7 +68,7 @@ export AREA LANG LC_ALL ZONE make %{?_smp_mflags} TZDIR=%{_datadir}/zoneinfo CFLAGS="%{optflags} -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"' -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -Dlint" AWK=awk BUGEMAIL="opensuse-support@opensuse.org" make %{?_smp_mflags} TZDIR=zoneinfo AWK=awk zones # Generate posixrules -./zic -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE} +./zic -b fat -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE} %install mkdir -p %{buildroot}%{_prefix}/share/zoneinfo diff --git a/tzcode2020a.tar.gz b/tzcode2020a.tar.gz deleted file mode 100644 index c9d41d8..0000000 --- a/tzcode2020a.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d2af7120ee03df71fbca24031ccaf42404752e639196fe93c79a41b38a6d669 -size 257509 diff --git a/tzcode2020a.tar.gz.asc b/tzcode2020a.tar.gz.asc deleted file mode 100644 index b5f91f1..0000000 --- a/tzcode2020a.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl6iH9IACgkQ7ZfpDmKq -fjQK6BAAgxpJVrK35eNuGheX51np4f7mOAomDzMqXSaYZqYLW2EZCa+JW6VWfrEm -eMZYVA/U33WsIGTjyyjfmq5FVwIQj0An+mAtlOR5dd34/ikGddZjd28ChrMW9+56 -VFS7dA2pUjMzQp7yGG5sVek5OeGaHajfwxzBptPrsK+JwyNC1RcGetEcrgUwwznX -S1iiLFvfzgVhrqnYzthIuoUikLSUkNumkr4/8frsYwywQ0axAzpkLi5rWxOfZAi6 -a1MLMXvKmzXeiNCu5oeKl2XfTymBUVyF7K3dzFdkrOto8pSTDR+BbSh88mbe7tct -Rt0q/GRq8fityECzdVAzoAqCRUU97t8V4VHNFXSxy32CN99cjsLdRMiVVEGTq+TT -A3m9FjQidSCP3apzQe9JDfj536gQFSkUmDlcFwya31zolRoWkIFmxIhmZWIYlm9T -Wjqc7y7UnrBNvyDE4pemQ4YYHjk5YLjwoaUIafDJTAiDRfcf53SRlr3tbFcYjAt/ -Tql77DWuLmg8PGFtRiyCMqrehboGi0Eu3he2MmYtsJB2ZXFN0yZQmlvDen9fkt1k -EqUkKjhHmVBb5WVS5pbl8mGLr1TFtnnedmLw4xULrDzsyJ5tsqzVnkl6Ga/eoIal -lLIxpXrYqQLdHNtTpdmJkqZ/89++HDov9JR0uMzU8LxFwH6duQ4= -=0y/R ------END PGP SIGNATURE----- diff --git a/tzcode2020d.tar.gz b/tzcode2020d.tar.gz new file mode 100644 index 0000000..499c63b --- /dev/null +++ b/tzcode2020d.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cf050ba28e8053029d3f32d71341d11a794c6b5dd51a77fc769d6dae364fad5 +size 260182 diff --git a/tzcode2020d.tar.gz.asc b/tzcode2020d.tar.gz.asc new file mode 100644 index 0000000..37be732 --- /dev/null +++ b/tzcode2020d.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl+QfYEACgkQ7ZfpDmKq +fjQONxAAsutVmD1mKngEto0UotZPTOM74RbV11sim+D9PGg04JbQIDUhclmW3Zw7 +CAp0QTu0MBs78lA2qugIyv5ma/61LanOA9pcBdjlJ5DA485wAvMCW9deUfK50pTA +nzYri3uZ2IwISao4hBWUP7IGQ0fSpbfSiSoxTMcYbNRVWCnDJhfC97SsegMPSN5q +4lPit82uCLIa6s4vk/SuHPFO21TJY5e7DouUG7vkdJRJIX8GUNUMV47IO8cQQUD6 +O4Zvsd6ha49iRDJy6mDkIrMpK3r0yC58kZaMXzV++XZA+G4D7sYZbkKnukTGMky/ +bB0v2oTIB5BulkM1u1b5/hR0aZ8WlFk6WEDVP6jG+Vvb5rZW4nkOoFI2JjI2vFhZ +p0PgzThn8sqUQn2lGbsYA8w7DujKW7nZ5ENFbHhWDm4GHYCRQSTTFU7tHGQbkzqg +XFgvYbdPW2er/vpbw5QXSUa3UwdssiXuGUvLMka0aYKPPe5ahAkyE+jDEwoN3K9h +e561luc13HwmjOwVxmya4IAomAb+IM4Pt821aKOzELD0epBdk7YmlD0kcqh4LeqR +lxawXbLlGQHBAv4DBC58eQNGcP3DaC7fCPhG+cfL9jT1Ygbm8Ncg9ndWZVn5RS1X +7WCqkX9tSFN6CJkd2ozVzoJWjE8NdotdFI05e5Az2zaNmnV6iSk= +=/2fr +-----END PGP SIGNATURE----- diff --git a/tzdata2020a.tar.gz b/tzdata2020a.tar.gz deleted file mode 100644 index 676a1e0..0000000 --- a/tzdata2020a.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:547161eca24d344e0b5f96aff6a76b454da295dc14ed4ca50c2355043fb899a2 -size 397245 diff --git a/tzdata2020a.tar.gz.asc b/tzdata2020a.tar.gz.asc deleted file mode 100644 index 05e00c7..0000000 --- a/tzdata2020a.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl6iH9MACgkQ7ZfpDmKq -fjTb6g/+P/l6Nev5Zv8mUktnT6eNKohtgpNRyHd8nYV92wmTiDSzAArFy7oi5CVV -/jMv8sbV1ssq/5rQ6HUQuMDPgEIO405gxmqRWMhE6UwUbRxxa+/HKGUJH0AHY6Dh -1UhVD7QA6fDovs84ip/WgTEZYcYApLr2A3IfC0rDqDo42DiSnErFQDvqRMJQkQS1 -p2Pv7YtW/2NZ52wkfq75klSsjlXzlz6CzM5P3/YU/Hylj42sQdbdtbUAyQug3YpD -QQ2PiZoP92iiGrcwkKXa5xvXJ6jEZCXqi7HbJKt8OW+XpZ/ZYbTZRq+JvMbTqkOL -+XvVufo/pVASgv2V0ynzJu/XRiFUeJaecmEg6QiAiJ74UMTXSGFnK//R32M9dp29 -B4p2X2jmW9qjCwjbjQXl1Yl5ddlSyvBk2Lk4s1repQ2t7kphZx2C8P2WyQYGeP7H -nZDucfmWK4OSh8cINexBE8xyagmv1T8mC4qEQbVPva6JysaodNBcf9WkKMCgituP -tbPsVekSmG1GyN2ixPtpY86Fzjr60mEg1UKqHZIagRmH4kjUwd1gINCJgONaZZxo -c1VfBD8ZORBZfG27+V5ISotKrK2UrKtcrSUEU1CC/ibOm1sSPfg0d5uxUVvg4E8+ -okdszbMnQ1i0eVKW+L+jY5XOO8kmSLp4YcnrqXDyZabxyWIGMt4= -=7U2J ------END PGP SIGNATURE----- diff --git a/tzdata2020d.tar.gz b/tzdata2020d.tar.gz new file mode 100644 index 0000000..15490c3 --- /dev/null +++ b/tzdata2020d.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d813957de363387696f05af8a8889afa282ab5016a764c701a20758d39cbaf3 +size 401479 diff --git a/tzdata2020d.tar.gz.asc b/tzdata2020d.tar.gz.asc new file mode 100644 index 0000000..3d45ad9 --- /dev/null +++ b/tzdata2020d.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl+QfYEACgkQ7ZfpDmKq +fjR5wxAAjzC37QyQyyLS3GePbM3GAY0kDf40ieCHU9LBEBqTDXFbC8WaMCc+3jQ+ ++iaFJbjK6iJeaZLr+y9ea+W47fKmBd0ogW6mR11HiJdmGKncPze1O9aae/thT2UJ +KG3FIZYE5hERkyeNMHjwUJqVKcrg5VaE0iuUOlGrwpnNwPQl80zyRWhi0RbMomHR +XD7jvMwpTy+x7lEWXA7WLUcxHwY3ezdMjPOwX+9EAVMMNCNEgRSaeBFIo9z3YUnc +ppMnQ537TqfvmdvslDc+c6AXI2PqwHBQSluWMNUJHnC8KXdwFB+G2LJRdov7WqdU ++dnUKZsGwMxPHqgbNpINf4q48tIg6xEDVXH12973EV1Rh4Tao0g4l18WpFOCXqeI +/vNETZHkcqNkhpMb5XI289LU3Mc889RjEjwhpKJv0RN+bw5sRvgftY8j/Vp1Jty0 +gHpCA3M1YRglq0SBpfsWpXJsz3T1EcRdT5XToTpG321OsRoymjZ7txqF5siAiWBo +P7zGgBe+0mIZ3bSDI/o1a/yuL0jwjTru2SbC6B9maOZXw2iPzEB6j8grFLmsUj7u +e/s5jaqYrPTD8PsvBO1r20sP2HwQHhvew+TemVhSuW0yfqifffx0ybwZrw6oF0Ig +SEPdSJkwsiOu7U/cKIFuClsZUaiOjjWu9SMWKUNm6AHXpO8CuCk= +=48vS +-----END PGP SIGNATURE-----