From 8e5349eefff4892d09c0b7b71a20c71ae2f1fed9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 21 2016 17:59:25 +0000
Subject: import tzdata-2016e-1.el7


---

diff --git a/.gitignore b/.gitignore
index c70aced..dad7687 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 SOURCES/javazic.tar.gz
-SOURCES/tzcode2016d.tar.gz
-SOURCES/tzdata2016d.tar.gz
+SOURCES/tzcode2016e.tar.gz
+SOURCES/tzdata2016e.tar.gz
diff --git a/.tzdata.metadata b/.tzdata.metadata
index 466c29e..cfa2c61 100644
--- a/.tzdata.metadata
+++ b/.tzdata.metadata
@@ -1,4 +1,4 @@
 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz
-48ad2724fffd57da6763ac26340fac333c5cb9c2 SOURCES/tzcode2016d.tar.gz
-2689e164842389ad682323d38cc52921195aa943 SOURCES/tzdata2016d.tar.gz
+043211c9b7d8430671ae29a10e274e0fb00f26b8 SOURCES/tzcode2016e.tar.gz
+5a65dd3aeeb0c8de7b359b810bb0d032d344b6bd SOURCES/tzdata2016e.tar.gz
diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec
index 5301480..12814ad 100644
--- a/SPECS/tzdata.spec
+++ b/SPECS/tzdata.spec
@@ -1,19 +1,8 @@
-
-%bcond_without java7
-
-%if %{with java7}
-%define bin_java %{_prefix}/lib/jvm/java-1.7.0/bin/java
-%define bin_javac %{_prefix}/lib/jvm/java-1.7.0/bin/javac
-%else
-%define bin_java java
-%define bin_javac javac
-%endif
-
 Summary: Timezone data
 Name: tzdata
-Version: 2016d
-%define tzdata_version 2016d
-%define tzcode_version 2016d
+Version: 2016e
+%define tzdata_version 2016e
+%define tzcode_version 2016e
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -25,11 +14,7 @@ Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
 BuildRequires: glibc-common >= 2.5.90-7
-%if %{with java7}
-BuildRequires: java-1.7.0-openjdk-devel
-%else
 BuildRequires: java-devel
-%endif
 
 Conflicts: glibc-common <= 2.3.2-63
 BuildArchitectures: noarch
@@ -96,24 +81,22 @@ grep -v tz-art.htm tz-link.htm > tz-link.html
 
 # Java 6/7 tzdata
 pushd javazic
-%{bin_javac} -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
+javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
 popd
 
-%{bin_java} -classpath javazic/ rht.tools.javazic.Main -V %{version} \
+java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
   -d javazi \
   $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
 
 # Java 8 tzdata
-%if %{with java7}
 pushd javazic-1.8
-%{bin_javac} -source 1.7 -target 1.7 -classpath . `find . -name \*.java`
+javac -source 1.7 -target 1.7 -classpath . `find . -name \*.java`
 popd
 
-%{bin_java} -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
+java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
     -srcdir . -dstfile tzdb.dat \
     -verbose \
     $FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
-%endif
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -122,10 +105,8 @@ cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir}
 install -p -m 644 zone.tab iso3166.tab $RPM_BUILD_ROOT%{_datadir}/zoneinfo
 cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
 
-%if %{with java7}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
 install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -140,11 +121,17 @@ rm -rf $RPM_BUILD_ROOT
 %files java
 %defattr(-,root,root)
 %{_datadir}/javazi
-%if %{with java7}
 %{_datadir}/javazi-1.8
-%endif
 
 %changelog
+* Tue Jun 14 2016 Patsy Franklin <pfrankli@redhat.com> - 2016e-1
+- Rebase to 2016e
+  - Egypt reinstates DST.
+
+* Fri May 06 2016 Patsy Franklin <pfrankli@redhat.com> - 2016d-2
+- Fix java conditionals to always build all the java tzdata. OpenJDK 7 is the
+  default/base Java. It is sufficient for building everything. (#1230903)
+
 * Mon Apr 18 2016 Patsy Franklin <pfrankli@redhat.com> - 2016d-1
 - Rebase to 2016d 
   - America/Caracas switches from -0430 to -04 on 2016-05-01 at 02:30.