From 46016b52dade0ae92917142952135005bbea8e05 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Jun 18 2014 01:04:21 +0000 Subject: 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 --- diff --git a/.gitignore b/.gitignore index 1351b70..c32170a 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,5 @@ noarch/ /tzdata2014b.tar.gz /tzcode2014c.tar.gz /tzdata2014c.tar.gz +/tzcode2014e.tar.gz +/tzdata2014e.tar.gz diff --git a/sources b/sources index f9bbd38..ae25eb2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz -657636f201ae8b561225afde49d274af tzcode2014c.tar.gz -fa7f3dc1c6f6238253a6f2b850467e2e tzdata2014c.tar.gz +552251600ee3571c244d33c7196ec2ed tzcode2014e.tar.gz +8a49fdedd4e832da8e85f7f9bcaedc33 tzdata2014e.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 46ec776..cdff008 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: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -37,7 +37,6 @@ This package contains timezone information for use by Java runtimes. %setup -q -c -a 1 # Add new patches here... -# %patch1 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -98,6 +97,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi %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 + * Wed May 14 2014 Patsy Franklin 2014c-1 - Rebase to 2014c - Egypt will re-apply DST on May 15 at 24:00, except that DST