[perl-DateTime-TimeZone/f20] Keep preferring /etc/localtime

[Petr Pisar]

commit 43c9a65a7ab98f002a693b57f0f6714de6878e6e
Author: Petr Písař <ppisar at redhat.com>
Date:   Mon Nov 3 13:01:00 2014 +0100

    Keep preferring /etc/localtime

 ...nix-systems-look-for-etc-timezone-first-b.patch |   38 ++++++++++++++++++++
 perl-DateTime-TimeZone.spec                        |    4 ++
 2 files changed, 42 insertions(+), 0 deletions(-)
---
diff --git a/DateTime-TimeZone-1.76-Revert-on-unix-systems-look-for-etc-timezone-first-b.patch b/DateTime-TimeZone-1.76-Revert-on-unix-systems-look-for-etc-timezone-first-b.patch
new file mode 100644
index 0000000..9c5a396
--- /dev/null
+++ b/DateTime-TimeZone-1.76-Revert-on-unix-systems-look-for-etc-timezone-first-b.patch
@@ -0,0 +1,38 @@
+From 71736afa98446d1eea28f8ae7d7d57dc0e237815 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Mon, 3 Nov 2014 12:54:50 +0100
+Subject: [PATCH] Revert "on unix systems, look for /etc/timezone first before
+ /etc/localtime"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit d12b4612e1b6171081cf6f60d089fe340638ade7.
+
+On Linux, the canonical source of time zone is /etc/locatime. Not
+/etc/timezone.
+
+<https://bugzilla.redhat.com/show_bug.cgi?id=1159509>
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/DateTime/TimeZone/Local/Unix.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/DateTime/TimeZone/Local/Unix.pm b/lib/DateTime/TimeZone/Local/Unix.pm
+index 0f9beb1..db96616 100644
+--- a/lib/DateTime/TimeZone/Local/Unix.pm
++++ b/lib/DateTime/TimeZone/Local/Unix.pm
+@@ -9,8 +9,8 @@ use parent 'DateTime::TimeZone::Local';
+ sub Methods {
+     return qw(
+         FromEnv
+-        FromEtcTimezone
+         FromEtcLocaltime
++        FromEtcTimezone
+         FromEtcTIMEZONE
+         FromEtcSysconfigClock
+         FromEtcDefaultInit
+-- 
+1.9.3
+
diff --git a/perl-DateTime-TimeZone.spec b/perl-DateTime-TimeZone.spec
index 6f6cb68..a8a51cd 100644
--- a/perl-DateTime-TimeZone.spec
+++ b/perl-DateTime-TimeZone.spec
@@ -6,6 +6,8 @@ License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/DateTime-TimeZone/
 Source0:        http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-%{version}.tar.gz
+# Keep preferring /etc/localtime, bug #1159509.
+Patch0:         DateTime-TimeZone-1.76-Revert-on-unix-systems-look-for-etc-timezone-first-b.patch
 BuildArch:      noarch
 BuildRequires:  perl
 BuildRequires:  perl(base)
@@ -73,6 +75,7 @@ offset from GMT for a given time period.
 
 %prep
 %setup -q -n DateTime-TimeZone-%{version}
+%patch0 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -96,6 +99,7 @@ make test
 %changelog
 * Mon Nov 03 2014 Petr Pisar <ppisar at redhat.com> - 1.76-1
 - 1.76 bump
+- Keep preferring /etc/localtime (bug #1159509)
 
 * Wed Oct 01 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.75-1
 - 1.75 bump