From d22cf29f78111b4bcbe2902a94a397a3851b9549 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 06 2019 10:54:22 +0000
Subject: import perl-DateTime-TimeZone-1.70-2.el7


---

diff --git a/.gitignore b/.gitignore
index bceceda..a4b2885 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 SOURCES/DateTime-TimeZone-1.70.tar.gz
-SOURCES/tzdata2017b.tar.gz
+SOURCES/tzdata2018i.tar.gz
diff --git a/.perl-DateTime-TimeZone.metadata b/.perl-DateTime-TimeZone.metadata
index f4dc566..ff83292 100644
--- a/.perl-DateTime-TimeZone.metadata
+++ b/.perl-DateTime-TimeZone.metadata
@@ -1,2 +1,2 @@
 0f9b98d777f21e50cd123397a505539e7788342e SOURCES/DateTime-TimeZone-1.70.tar.gz
-0f13bbb641f5742796609d3484006fe01fa654f1 SOURCES/tzdata2017b.tar.gz
+bd5cd102c4a3c8206834b9bc6922437cc698c3c0 SOURCES/tzdata2018i.tar.gz
diff --git a/SOURCES/DateTime-TimeZone-1.70-Recognize-25-00-time.patch b/SOURCES/DateTime-TimeZone-1.70-Recognize-25-00-time.patch
new file mode 100644
index 0000000..3b9cb9a
--- /dev/null
+++ b/SOURCES/DateTime-TimeZone-1.70-Recognize-25-00-time.patch
@@ -0,0 +1,35 @@
+From 4241f291ff4d9779896464b51727e84d38cb2c1c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Thu, 17 Jan 2019 08:11:43 +0100
+Subject: [PATCH] Recognize 25:00 time
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+2018f changed format and some time zones like Asia/Tokyo use 25:00
+value for AT attribute. A conversion script from
+DateTime-TimeZones-2.20 added support for this syntax.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ lib/DateTime/TimeZone/OlsonDB.pm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/DateTime/TimeZone/OlsonDB.pm b/lib/DateTime/TimeZone/OlsonDB.pm
+index 1ea6a5a..24fc83c 100644
+--- a/lib/DateTime/TimeZone/OlsonDB.pm
++++ b/lib/DateTime/TimeZone/OlsonDB.pm
+@@ -253,8 +253,8 @@ sub utc_datetime_for_time_spec {
+     $second = 0 unless defined $second;
+ 
+     my $add_day = 0;
+-    if ( $hour == 24 ) {
+-        $hour    = 0;
++    if ( $hour >= 24 ) {
++        $hour    = $hour - 24;
+         $add_day = 1;
+     }
+ 
+-- 
+2.17.2
+
diff --git a/SPECS/perl-DateTime-TimeZone.spec b/SPECS/perl-DateTime-TimeZone.spec
index e9475f7..77e6b47 100644
--- a/SPECS/perl-DateTime-TimeZone.spec
+++ b/SPECS/perl-DateTime-TimeZone.spec
@@ -1,9 +1,9 @@
 # Regenerate Perl library code from upstream Olson database of this date
-%global tzversion 2017b
+%global tzversion 2018i
 
 Name:           perl-DateTime-TimeZone
 Version:        1.70
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Time zone object base class and factory
 # tzdata%%{tzversion}.tar.gz archive:   Public Domain
 # other files:                          GPL+ or Artistic
@@ -22,6 +22,8 @@ Patch1:         DateTime-TimeZone-1.70-Inject-DT-TZ-version-when-generating-modu
 Patch2:         DateTime-TimeZone-1.70-Adjust-tests-to-time-zone-data-2017b.patch
 # Adjust conversion script to 2017b, bug #1101251, in upstream 1.96
 Patch3:         DateTime-TimeZone-1.70-Recognize-short-zone-names-starting-with-a-sign.patch
+# Adjust a conversion script to 2018f, bug #1537984, in upstream 2.20
+Patch4:         DateTime-TimeZone-1.70-Recognize-25-00-time.patch
 BuildArch:      noarch
 BuildRequires:  findutils
 BuildRequires:  make
@@ -110,6 +112,7 @@ offset from GMT for a given time period.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %if !%{defined perl_bootstrap} && %{defined tzversion}
@@ -133,6 +136,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jan 17 2019 Petr Pisar <ppisar@redhat.com> - 1.70-2
+- Update time zone data to Olson 2018i (bug #1537984)
+
 * Mon Jul 10 2017 Petr Pisar <ppisar@redhat.com> - 1.70-1
 - 1.70 bump (bug #1101251)
 - Regenerate Perl code from timezone sources (bug #1101251)