- Include the upstream patch to support pacificnew for java tzupdater.
- Set POSIXRULES macro to continue installing posixrules file.
This commit is contained in:
Patsy Griffin 2020-10-13 22:46:34 -04:00
parent 11275cf413
commit 5d4dfeecb7
3 changed files with 57 additions and 2 deletions

View File

@ -0,0 +1,34 @@
From 0c8cac40a6ee69e106f3b034624890b98cad5b01 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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/' \
<version >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 $@

View File

@ -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

View File

@ -3,14 +3,16 @@ Name: tzdata
Version: 2020b
%define tzdata_version 2020b
%define tzcode_version 2020b
Release: 1%{?dist}
Release: 2%{?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-error.patch
Patch003: 0003-continue-to-ship-posixrules.patch
BuildRequires: gawk, glibc, perl-interpreter
BuildRequires: java-devel
@ -40,7 +42,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
@ -90,7 +94,7 @@ echo "%{name}%{tzdata_version}" >> VERSION
%build
FILES="africa antarctica asia australasia europe northamerica southamerica
etcetera backward"
pacificnew etcetera backward"
mkdir zoneinfo/{,posix,right}
zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
@ -147,6 +151,10 @@ echo ============END TESTING===========
%{_datadir}/javazi-1.8
%changelog
* Tue Oct 13 2020 Patsy Griffin <patsy@redhat.com> - 2020b-2
- Include the upstream patch to support pacificnew for java tzupdater.
- Set POSIXRULES macro to continue installing posixrules file.
* Wed Oct 07 2020 Patsy Griffin <patsy@redhat.com> - 2020b-1
- Rebase to tzdata-2020b
- Yukon timezones represented by America/Whitehorse and