From 86eda0375f2e21a78fc1aea481b8a9135f662a4f Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 16 Dec 2020 19:37:17 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/tzdata.git#e3138a9a8bb19f82ba570dd82592bdaa1fabe831
---
 0003-continue-to-ship-posixrules.patch | 13 +++++++++++++
 tzdata.spec                            | 27 ++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 0003-continue-to-ship-posixrules.patch

diff --git a/0003-continue-to-ship-posixrules.patch b/0003-continue-to-ship-posixrules.patch
new file mode 100644
index 0000000..1755352
--- /dev/null
+++ b/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/tzdata.spec b/tzdata.spec
index b83232e..c6d9078 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,13 +3,16 @@ Name: tzdata
 Version: 2020d
 %define tzdata_version 2020d
 %define tzcode_version 2020d
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 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
 
 Patch002: 0002-Fix-have-snprintf-error.patch
+%if 0%{?rhel} || 0%{?eln}
+Patch003: 0003-continue-to-ship-posixrules.patch
+%endif
 
 BuildRequires: gawk, glibc, perl-interpreter
 BuildRequires: java-devel
@@ -38,6 +41,9 @@ This package contains timezone information for use by Java runtimes.
 %setup -q -c -a 1
 
 %patch002 -p1
+%if 0%{?rhel} || 0%{?eln}
+%patch003 -p1
+%endif
 
 # tzdata-2018g introduced 25:00 transition times.  This breaks OpenJDK.
 # Use rearguard for java
@@ -48,6 +54,11 @@ pushd rearguard
 tar zxf tzdata%{version}-rearguard.tar.gz
 popd
 
+%if 0%{?rhel} || 0%{?eln}
+# Use rearguard for rhel (overwrite default vangaurd data)
+tar zxf rearguard/tzdata%{version}-rearguard.tar.gz
+%endif
+
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
 pushd javazic
@@ -75,7 +86,12 @@ echo "%{name}%{tzdata_version}" >> VERSION
 
 %build
 # Run make to create the tzdata.zi file
+rm tzdata.zi
+%if 0%{?rhel} || 0%{?eln}
+make VERSION=%{version} DATAFORM=rearguard tzdata.zi
+%else
 make tzdata.zi
+%endif
 
 FILES="africa antarctica asia australasia europe northamerica southamerica
        etcetera backward factory"
@@ -134,7 +150,14 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
-* Wed Oct 23 2020 Patsy Griffin <patsy@redhat.com> - 2020d-1
+* Wed Dec 16 2020 Patsy Griffin <patsy@redhat.com> - 2020d-3
+- Add 0003-continue-to-ship-posixrules.patch to initialize
+  POSIXRULES variable.
+
+* Wed Dec 16 2020 Patsy Griffin <patsy@redhat.com> - 2020d-2
+- Add conditional support for rhel and eln.
+
+* Fri Oct 23 2020 Patsy Griffin <patsy@redhat.com> - 2020d-1
 - Rebase to tzdata-2020d including changes from tzdata-2020c
   - Palestine will end summer time on 2020-10-24 rather than the
     predicted 2020-10-31.