diff --git a/.gitignore b/.gitignore index ebf7b2e..76fc79c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/javazic-1.8-37392f2f5d59.tar.xz SOURCES/javazic.tar.gz -SOURCES/tzcode2020a.tar.gz -SOURCES/tzdata2020a.tar.gz +SOURCES/tzcode2020b.tar.gz +SOURCES/tzdata2020b.tar.gz diff --git a/.tzdata.metadata b/.tzdata.metadata index 8a446dc..93ebc70 100644 --- a/.tzdata.metadata +++ b/.tzdata.metadata @@ -1,4 +1,4 @@ 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz -adda5022d02085cfe81862a6b8f60cd7df1dedde SOURCES/tzcode2020a.tar.gz -d9f29aab03246713e6c5b792f49871846b4cfeda SOURCES/tzdata2020a.tar.gz +1581c5cb8560daa1c2e4747ad6a9f19506b669c9 SOURCES/tzcode2020b.tar.gz +89f5295b0bdbc8315f97fd8f7f5ed035f238a1e7 SOURCES/tzdata2020b.tar.gz diff --git a/SOURCES/0001-Put-dummy-pacificnew-into-rearguard-tarball.patch b/SOURCES/0001-Put-dummy-pacificnew-into-rearguard-tarball.patch new file mode 100644 index 0000000..95818e5 --- /dev/null +++ b/SOURCES/0001-Put-dummy-pacificnew-into-rearguard-tarball.patch @@ -0,0 +1,34 @@ +From 0c8cac40a6ee69e106f3b034624890b98cad5b01 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 12 Oct 2020 16:15:27 -0700 +Subject: [PROPOSED] Put dummy pacificnew into rearguard tarball + +Problem reported by Mike Cullinan in: +https://mm.icann.org/pipermail/tz/2020-October/029309.html +* Makefile (tzdata$(VERSION)-rearguard.tar.gz): +Put an empty pacificnew file into the rearguard tarball. +* NEWS: Mention this. +--- + Makefile | 6 +++++- + NEWS | 7 +++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 28972c6..95f0a06 100644 +--- a/Makefile ++++ b/Makefile +@@ -1022,10 +1022,14 @@ tzdata$(VERSION)-rearguard.tar.gz: rearguard.zi set-timestamps.out + done + sed '1s/$$/-rearguard/' \ + tzdata$(VERSION)-rearguard.dir/version ++ : The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier. ++ touch -md 2020-10-12T22:53:00Z \ ++ tzdata$(VERSION)-rearguard.dir/pacificnew + touch -cmr version tzdata$(VERSION)-rearguard.dir/version + LC_ALL=C && export LC_ALL && \ + (cd tzdata$(VERSION)-rearguard.dir && \ +- tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \ ++ tar $(TARFLAGS) -cf - \ ++ $(COMMON) $(DATA) $(MISC) pacificnew | \ + gzip $(GZIPFLAGS)) >$@.out + mv $@.out $@ diff --git a/SOURCES/0003-continue-to-ship-posixrules.patch b/SOURCES/0003-continue-to-ship-posixrules.patch new file mode 100644 index 0000000..1755352 --- /dev/null +++ b/SOURCES/0003-continue-to-ship-posixrules.patch @@ -0,0 +1,13 @@ +diff -Nrup a/Makefile b/Makefile +--- a/Makefile 2020-10-13 15:58:12.000000000 -0400 ++++ b/Makefile 2020-10-13 16:03:09.461302282 -0400 +@@ -60,7 +60,7 @@ LOCALTIME= GMT + # make zonenames + # to get a list of the values you can use for POSIXRULES. + +-POSIXRULES= - ++POSIXRULES= America/New_York + + # Also see TZDEFRULESTRING below, which takes effect only + # if the time zone files cannot be accessed. +Binary files a/tzdata2020b-rearguard.tar.gz and b/tzdata2020b-rearguard.tar.gz differ diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec index 6c6d523..ceb6bc1 100644 --- a/SPECS/tzdata.spec +++ b/SPECS/tzdata.spec @@ -1,16 +1,18 @@ Summary: Timezone data Name: tzdata -Version: 2020a -%define tzdata_version 2020a -%define tzcode_version 2020a -Release: 1%{?dist} +Version: 2020b +%define tzdata_version 2020b +%define tzcode_version 2020b +Release: 3%{?dist} License: Public Domain Group: System Environment/Base URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz +Patch001: 0001-Put-dummy-pacificnew-into-rearguard-tarball.patch Patch002: 0002-Fix-have-snprintf.patch +Patch003: 0003-continue-to-ship-posixrules.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -43,7 +45,9 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 +%patch001 -p1 %patch002 -p1 +%patch003 -p1 # Currently tzdata is providing the "rearguard" data set for maximum # compatibility with existing Red Hat Enterprise Linux installs. Future releases of @@ -93,7 +97,7 @@ echo "%{name}%{tzdata_version}" >> VERSION %build FILES="africa antarctica asia australasia europe northamerica southamerica - pacificnew etcetera backward" + pacificnew etcetera backward" mkdir zoneinfo/{,posix,right} zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES @@ -148,6 +152,23 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Tue Oct 13 2020 Patsy Griffin - 2020b-3 +- Include the upstream patch to support pacificnew for java tzupdater. +- Set POSIXRULES macro to continue installing posixrules file. + +* Fri Oct 09 2020 Patsy Griffin - 2020b-2 +- Need to rebuild, bump the release. + +* Wed Oct 07 2020 Patsy Griffin - 2020b-1 +- Rebase to tzdata-2020b + - Yukon timezones represented by America/Whitehorse and + America/Dawson will change time zone rules from -08/-07 to + permanent -07 on 2020-11-01, not on 2020-03-08 as 2020a had it. + - The most recent winter(+08)/summer(+11) transition for Casey Station, + Antarctica was 2020-10-04 00:01. + - Remove obsolete files pacificnew, systemv, and yearistype.sh + from the distribution. + * Fri Apr 24 2020 Patsy Griffin - 2020a-1 - Rebase to tzdata-2020a - Morocco will spring forward on 2020-05-31 rather than