diff --git a/.gitignore b/.gitignore
index 39f7e17..1e50c79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
SOURCES/javazic-1.8-37392f2f5d59.tar.xz
SOURCES/javazic.tar.gz
-SOURCES/tzcode2018e.tar.gz
-SOURCES/tzdata2018e.tar.gz
+SOURCES/tzcode2018f.tar.gz
+SOURCES/tzdata2018f.tar.gz
diff --git a/.tzdata.metadata b/.tzdata.metadata
index fd06b38..3e0d68a 100644
--- a/.tzdata.metadata
+++ b/.tzdata.metadata
@@ -1,4 +1,4 @@
77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz
ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz
-e0396f6984aa6831189e90daf0d79334714bb9f6 SOURCES/tzcode2018e.tar.gz
-9ab1932256674075fb74ff84792582b5ac12c476 SOURCES/tzdata2018e.tar.gz
+292e236bb1b201d582985c80d344f5ce4c5b0433 SOURCES/tzcode2018f.tar.gz
+8b30b7fe40d348db9b5acc4ed2245f96265039ee SOURCES/tzdata2018f.tar.gz
diff --git a/SOURCES/0001-Avoid-25-00-in-rearguard-format.patch b/SOURCES/0001-Avoid-25-00-in-rearguard-format.patch
new file mode 100644
index 0000000..3637343
--- /dev/null
+++ b/SOURCES/0001-Avoid-25-00-in-rearguard-format.patch
@@ -0,0 +1,49 @@
+commit 401c42d991d4277cd606933fc9f5d9a13d1ac228
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu Oct 18 11:06:07 2018 -0700
+
+ Avoid 25:00 in rearguard format
+
+ (Problem reported by Christos Zoulas.)
+ * NEWS: Mention this.
+ * ziguard.awk: Change "Rule ... Sat>=8 25:00" to "Rule ... Sun>=9 1:00".
+
+diff --git a/NEWS b/NEWS
+index aeeef10..16f0947 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,5 +1,16 @@
+ News for the tz database
+
++Unreleased, experimental changes
++
++ Changes to code
++
++ The translator to rearguard format now rewrites the line
++ "Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S" to
++ "Rule Japan 1948 1951 - Sep Sun>=9 1:00 0 S".
++ This caters to zic before 2007 and to at least one Java-based zi
++ compiler of uncertain vintage. (Reported by Christos Zoulas.)
++
++
+ Release 2018f - 2018-10-18 00:14:18 -0700
+
+ Briefly:
+diff --git a/ziguard.awk b/ziguard.awk
+index 42e2910..e3c7298 100644
+--- a/ziguard.awk
++++ b/ziguard.awk
+@@ -80,6 +80,13 @@ DATAFORM != "main" {
+ if (comment_out) {
+ sub(/^/, "#")
+ }
++
++ # In rearguard format, change the Japan rule line with "Sat>=8 25:00"
++ # to "Sun>=9 1:00", to cater to zic before 2007 and to older Java.
++ if (!vanguard && $1 == "Rule" && $7 == "Sat>=8" && $8 == "25:00") {
++ sub(/Sat>=8/, "Sun>=9")
++ sub(/25:00/, " 1:00")
++ }
+ }
+
+ # If a Link line is followed by a Zone line for the same data, comment
diff --git a/SOURCES/0002-Fix-have-snprintf-error.patch b/SOURCES/0002-Fix-have-snprintf-error.patch
deleted file mode 100644
index cafdf4d..0000000
--- a/SOURCES/0002-Fix-have-snprintf-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrup a/Makefile b/Makefile
---- a/Makefile 2017-10-23 18:03:40.237177646 -0400
-+++ b/Makefile 2017-10-23 18:06:20.060683518 -0400
-@@ -292,7 +292,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn
- # January's first Monday when a "%V" format is used and January 1
- # falls on a Friday, Saturday, or Sunday.
-
--CFLAGS=
-+CFLAGS= -DHAVE_SNPRINTF=1
-
- # Linker flags. Default to $(LFLAGS) for backwards compatibility
- # to release 2012h and earlier.
diff --git a/SOURCES/0002-Fix-have-snprintf.patch b/SOURCES/0002-Fix-have-snprintf.patch
new file mode 100644
index 0000000..3f6b930
--- /dev/null
+++ b/SOURCES/0002-Fix-have-snprintf.patch
@@ -0,0 +1,13 @@
+diff -Nrup a/Makefile b/Makefile
+--- a/Makefile 2018-10-04 14:49:24.000000000 -0400
++++ b/Makefile 2018-10-18 16:23:33.675393451 -0400
+@@ -343,7 +343,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn
+ # January's first Monday when a "%V" format is used and January 1
+ # falls on a Friday, Saturday, or Sunday.
+
+-CFLAGS=
++CFLAGS= -DHAVE_SNPRINTF=1
+
+ # Linker flags. Default to $(LFLAGS) for backwards compatibility
+ # to release 2012h and earlier.
+Binary files a/tzdata2018f-rearguard.tar.gz and b/tzdata2018f-rearguard.tar.gz differ
diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec
index b37d175..0f1548e 100644
--- a/SPECS/tzdata.spec
+++ b/SPECS/tzdata.spec
@@ -1,16 +1,17 @@
Summary: Timezone data
Name: tzdata
-Version: 2018e
-%define tzdata_version 2018e
-%define tzcode_version 2018e
-Release: 3%{?dist}
+Version: 2018f
+%define tzdata_version 2018f
+%define tzcode_version 2018f
+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
-Patch002: 0002-Fix-have-snprintf-error.patch
+Patch001: 0001-Avoid-25-00-in-rearguard-format.patch
+Patch002: 0002-Fix-have-snprintf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gawk, glibc, perl
@@ -43,6 +44,9 @@ This package contains timezone information for use by Java runtimes.
%prep
%setup -q -c -a 1
+%patch001 -p1
+%patch002 -p1
+
# Currently tzdata is providing the "rearguard" data set for maximum
# compatibility with existing Red Hat Enterprise Linux installs. Future releases of
# Red Hat Enterprise Linux will be transitioning to the default or "vanguard" tzdata
@@ -58,10 +62,9 @@ This package contains timezone information for use by Java runtimes.
make VERSION=%{version} tzdata%{version}-rearguard.tar.gz
tar zxf tzdata%{version}-rearguard.tar.gz
-%patch002 -p1
-
-# Run make to create the tzdata.zi file
-make DATAFORM=rearguard tzdata.zi
+# Run make to re-create the tzdata.zi file for rearguard format
+rm tzdata.zi
+make VERSION=%{version} DATAFORM=rearguard tzdata.zi
mkdir javazic
tar zxf %{SOURCE3} -C javazic
@@ -147,6 +150,19 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/javazi-1.8
%changelog
+* Fri Oct 19 2018 Patsy Griffin Franklin <pfrankli@redhat.com> - 2018f-2
+- Bump release and rebuild for target.
+
+* Thu Oct 18 2018 Patsy Griffin Franklin <pfrankli@redhat.com> - 2018f-1
+- Europe/Volgograd will change from UTC+3 to UTC+4 on October 28,2018.
+- Add patch to remove use of 25:00.
+- Drop previous change to DST in Brazil. The government rescinded the
+ change.
+
+* Thu Oct 11 2018 Patsy Griffin Franklin <pfrankli@redhat.com> - 2018e-4
+- Brazil moved the start of DST from the first Sunday in November
+ to the third Sunday in November.
+
* Sun May 06 2018 Patsy Franklin <pfrankli@redhat.com> - 2018e-3
- Update the tzdata2018e.tar.gz file. Make the tzdata.zi file during prep.