From 086e89b0de37e10a13e08771f2a854115b73e7f9 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Tue, 17 Jun 2014 21:34:29 -0400 Subject: [PATCH] -Rebase to 2014e - Morrocco suspends DTS for Ramadan June 28 at 03:00 and August 2 at 02:00 - Egypt suspends DTS for Ramadan June 26 and July 31 at 24:00 -Additional edit to support OpenJDK8. (#1091029) --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 17 +++++++++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5ea2433..8424997 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,5 @@ noarch/ /tzcode2014c.tar.gz /tzdata2014c.tar.gz /javazic-1.8-37392f2f5d59.tar.xz +/tzcode2014e.tar.gz +/tzdata2014e.tar.gz diff --git a/sources b/sources index f6cb643..d964b3a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz -657636f201ae8b561225afde49d274af tzcode2014c.tar.gz -fa7f3dc1c6f6238253a6f2b850467e2e tzdata2014c.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz +552251600ee3571c244d33c7196ec2ed tzcode2014e.tar.gz +8a49fdedd4e832da8e85f7f9bcaedc33 tzdata2014e.tar.gz diff --git a/tzdata.spec b/tzdata.spec index e38a0e7..f436ddb 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2014c -%define tzdata_version 2014c -%define tzcode_version 2014c +Version: 2014e +%define tzdata_version 2014e +%define tzcode_version 2014e Release: 3%{?dist} License: Public Domain Group: System Environment/Base @@ -89,7 +89,8 @@ popd java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \ -srcdir . -dstfile tzdb.dat \ - $FILES `find -type f javazic-1.8/tzdata_jdk/` + -verbose \ + $FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward %install rm -fr $RPM_BUILD_ROOT @@ -116,6 +117,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Tue Jun 17 2014 Patsy Franklin - 2014e-1 +- Rebase to 2014e + - Morrocco suspends DTS for Ramadan + June 28 at 03:00 and August 2 at 02:00 + - Egypt suspends DTS for Ramadan + June 26 and July 31 at 24:00 +- Additional edit to support OpenJDK8. (#1091029) + * Sun Jun 08 2014 Fedora Release Engineering - 2014c-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild