From f5ae10705fdc83f017256684ef0331b957c26ded Mon Sep 17 00:00:00 2001
From: Patsy Franklin <pfrankli@redhat.com>
Date: Wed, 22 Jan 2014 12:39:46 -0500
Subject: [PATCH] Resolves: #1054879 - Fiji ends DST on 2014-01-19 at 02:00,
 not the previously scheduled 03:00.

---
 001-tzdata-fiji-dst.patch | 55 +++++++++++++++++++++++++++++++++++++++
 tzdata.spec               |  8 +++++-
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 001-tzdata-fiji-dst.patch

diff --git a/001-tzdata-fiji-dst.patch b/001-tzdata-fiji-dst.patch
new file mode 100644
index 0000000..cdbd96f
--- /dev/null
+++ b/001-tzdata-fiji-dst.patch
@@ -0,0 +1,55 @@
+diff -Nrup a/australasia b/australasia
+--- a/australasia	2013-12-17 10:26:04.000000000 -0500
++++ b/australasia	2014-01-21 11:37:08.135130460 -0500
+@@ -354,16 +354,18 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
+ # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
+ 
+ # From the Fijian Government Media Center (2013-08-30) via David Wheeler:
+-# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am
+-# on Sunday 19th January, 2014....  move clocks forward by one hour from 2am
++# Fiji will start daylight savings on Sunday 27th October, 2013 ...
++# move clocks forward by one hour from 2am
+ # http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
+-#
+-# From Paul Eggert (2013-09-09):
++
++# From Steffen Thorsen (2013-01-10):
++# Fiji will end DST on 2014-01-19 02:00:
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
++
++# From Paul Eggert (2014-10-10):
+ # For now, guess that Fiji springs forward the Sunday before the fourth
+-# Monday in October.  This matches both recent practice and
+-# timeanddate.com's current spring-forward prediction.
+-# For the January 2014 transition we guessed right while timeanddate.com
+-# guessed wrong, so leave the fall-back prediction alone.
++# Monday in October, and springs back the penultimate Sunday in January.
++# This is ad hoc, but matches recent practice.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
+@@ -372,7 +374,8 @@ Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
+ Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
+ Rule	Fiji	2010	max	-	Oct	Sun>=21	2:00	1:00	S
+ Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
+-Rule	Fiji	2012	max	-	Jan	Sun>=18	3:00	0	-
++Rule    Fiji    2012    2013    -    Jan    Sun>=18    3:00    0    -
++Rule    Fiji    2014    max    -    Jan    Sun>=18    2:00    0    -
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26	# Suva
+ 			12:00	Fiji	FJ%sT	# Fiji Time
+diff -Nrup a/NEWS b/NEWS
+--- a/NEWS	2013-12-17 10:26:04.000000000 -0500
++++ b/NEWS	2014-01-21 11:37:08.136130469 -0500
+@@ -13,6 +13,11 @@ Release 2013i - 2013-12-17 07:25:23 -080
+     In 2004, Cuba began DST on March 28, not April 4.
+     (Thanks to Steffen Thorsen.)
+ 
++  Changes affecting near-future time stamps
++
++    Fiji ends DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00.
++    (Thanks to Steffen Thorsen.)
++
+   Changes affecting code
+ 
+     The compile-time flag NOSOLAR has been removed, as nowadays the
diff --git a/tzdata.spec b/tzdata.spec
index e599a33..bcab843 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,12 +3,13 @@ Name: tzdata
 Version: 2013i
 %define tzdata_version 2013i
 %define tzcode_version 2013i
-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
+Patch1: 001-tzdata-fiji-dst.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -34,6 +35,8 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
+%patch1 -p1
+
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
 pushd javazic
@@ -93,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Tue Jan 21 2014 Patsy Franklin <pfrankli@redhat.com> 2013i-2
+- Fiji ends DST on 2014-01-19 at 02:00, not the previously scheduled 03:00.
+
 * Wed Dec 18 2013 Patsy Franklin <pfrankli@redhat.com> 2013i-1
 - Rebase with early release of 2013i from Paul Eggert github.
   - Jordan switches back to standard time at 00:00 on December 20,2013.