From 7b508c803fa23e23cb711c5e109d7e09f131bf4b Mon Sep 17 00:00:00 2001
From: Patsy Franklin <pfrankli@redhat.com>
Date: Fri, 2 Feb 2018 09:41:45 -0500
Subject: [PATCH] =?UTF-8?q?Resolves:=20#1535266=20-=20Rebase=20to=20tzdata?=
 =?UTF-8?q?-2018c:=20=20=20-=20S=C3=A3o=20Tom=C3=A9=20and=20Pr=C3=ADncipe?=
 =?UTF-8?q?=20changed=20from=20+00=20to=20+01=20on=20January=201,=202018?=
 =?UTF-8?q?=20=20=20-=20Brazil's=20DST=20will=20start=20on=20the=20first?=
 =?UTF-8?q?=20Sunday=20in=20November=20=20=20-=20Support=20for=20the=20new?=
 =?UTF-8?q?=20zic=20-t=20option.=20=20=20-=20Add=20back=20pacificnew=20fil?=
 =?UTF-8?q?e=20omitted=20in=20tzdata-2018a?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 18 ++++++++++++------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad3251d..e1645bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,3 +158,5 @@ noarch/
 /tzdata2017b.tar.gz
 /tzcode2017c.tar.gz
 /tzdata2017c.tar.gz
+/tzcode2018c.tar.gz
+/tzdata2018c.tar.gz
diff --git a/sources b/sources
index ef2c9d2..b272d41 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2017c.tar.gz) = 0d8c3e07b0de9015a137602450468ceb6358312a50eeda2a860882367107b8ba9ef275880b292570a671b9910afc54e6209e1e642387d246bc9c08c4ff660ffb
-SHA512 (tzdata2017c.tar.gz) = feb5c544e617b30c73a397e5a1c51f9847d0fddf1dfa0f9ace2e6f686786f09b666937b2048e07075c84593fc584bd5a25d639fce70eca9735267df28621ab4c
+SHA512 (tzcode2018c.tar.gz) = 21988e876479e38661d41ea4c7b5218ba14b979739d7ba8d49a2d343bb9f37c654056ab21c046a6652715f012e4ca33c4aa109b1ec3ac5d0244dd3a7ea9ed6d2
+SHA512 (tzdata2018c.tar.gz) = 0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835
diff --git a/tzdata.spec b/tzdata.spec
index f92343a..48f1c01 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2017c
-%define tzdata_version 2017c
-%define tzcode_version 2017c
+Version: 2018c
+%define tzdata_version 2018c
+%define tzcode_version 2018c
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -10,7 +10,6 @@ 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
 
-Patch001: 0001-Fix-Makefile-quoting-bug.patch
 Patch002: 0002-Fix-have-snprintf-error.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,7 +40,6 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
-%patch001 -p1
 %patch002 -p1
 
 mkdir javazic
@@ -81,7 +79,7 @@ zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
 zic -y ./yearistype -d zoneinfo/posix -L /dev/null $FILES
 zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
 
-grep -v tz-art.htm tz-link.htm > tz-link.html
+# grep -v tz-art.htm tz-link.htm > tz-link.html
 
 # Java 6/7 tzdata
 pushd javazic
@@ -121,6 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README
 %doc theory.html
 %doc tz-link.html
+%doc tz-art.html
 
 %files java
 %defattr(-,root,root)
@@ -128,6 +127,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Feb 01 2018 Patsy Franklin <pfrankli@redhat.com> - 2018c-1
+- Rebase to tzdata-2018c:
+  - São Tomé and Príncipe changed from +00 to +01 on January 1, 2018
+  - Brazil's DST will start on the first Sunday in November
+  - Support for the new zic -t option.
+  - Add back pacificnew file omitted in tzdata-2018a
+
 * Thu Oct 26 2017 Patsy Franklin <pfrankli@redhat.com> - 2017c-1
 - Rebase to tzdata-2017c.
   - Northern Cyprus will revert to using EQ rules on October 29, 2017.