Rebase patch to remove a spurious back-up file

This commit is contained in:
Petr Písař 2015-01-29 08:59:39 +01:00
parent 30a0588552
commit 3ccd4071c4
2 changed files with 10 additions and 7 deletions

View File

@ -1,4 +1,4 @@
From ddb36a17bd9ab30c33532684af85c71cd5c04071 Mon Sep 17 00:00:00 2001 From fbf080cb5ca92f35a594967bdd3764c7dbb8c7f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 1 Sep 2014 17:37:12 +0200 Date: Mon, 1 Sep 2014 17:37:12 +0200
Subject: [PATCH] Parse /etc/localtime by DateTime::TimeZone::Tzfile Subject: [PATCH] Parse /etc/localtime by DateTime::TimeZone::Tzfile
@ -22,10 +22,10 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
1 file changed, 27 insertions(+) 1 file changed, 27 insertions(+)
diff --git a/lib/DateTime/TimeZone/Local/Unix.pm b/lib/DateTime/TimeZone/Local/Unix.pm diff --git a/lib/DateTime/TimeZone/Local/Unix.pm b/lib/DateTime/TimeZone/Local/Unix.pm
index 71d7d4e..3c24ad0 100644 index ae26fae..c5d44fe 100644
--- a/lib/DateTime/TimeZone/Local/Unix.pm --- a/lib/DateTime/TimeZone/Local/Unix.pm
+++ b/lib/DateTime/TimeZone/Local/Unix.pm +++ b/lib/DateTime/TimeZone/Local/Unix.pm
@@ -14,6 +14,7 @@ sub Methods { @@ -16,6 +16,7 @@ sub Methods {
FromEtcTIMEZONE FromEtcTIMEZONE
FromEtcSysconfigClock FromEtcSysconfigClock
FromEtcDefaultInit FromEtcDefaultInit
@ -33,7 +33,7 @@ index 71d7d4e..3c24ad0 100644
); );
} }
@@ -233,6 +234,25 @@ sub _ReadEtcDefaultInit { @@ -237,6 +238,25 @@ sub _ReadEtcDefaultInit {
} }
} }
@ -59,7 +59,7 @@ index 71d7d4e..3c24ad0 100644
1; 1;
# ABSTRACT: Determine the local system's time zone on Unix # ABSTRACT: Determine the local system's time zone on Unix
@@ -307,6 +327,13 @@ a time zone name. @@ -309,6 +329,13 @@ a time zone name.
If this file exists, it is opened and we look for a line starting like If this file exists, it is opened and we look for a line starting like
"TZ=...". If this is found, it should indicate a time zone name. "TZ=...". If this is found, it should indicate a time zone name.

View File

@ -1,6 +1,6 @@
Name: perl-DateTime-TimeZone Name: perl-DateTime-TimeZone
Version: 1.83 Version: 1.83
Release: 2%{?dist} Release: 3%{?dist}
Summary: Time zone object base class and factory Summary: Time zone object base class and factory
License: GPL+ or Artistic License: GPL+ or Artistic
Group: Development/Libraries Group: Development/Libraries
@ -8,7 +8,7 @@ URL: http://search.cpan.org/dist/DateTime-TimeZone/
Source0: http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-%{version}.tar.gz Source0: http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-%{version}.tar.gz
# Parse local time zone definition from /etc/localtime as before giving up, # Parse local time zone definition from /etc/localtime as before giving up,
# bug #1135981, CPAN RT#55029 # bug #1135981, CPAN RT#55029
Patch0: DateTime-TimeZone-1.74-Parse-etc-localtime-by-DateTime-TimeZone-Tzfile.patch Patch0: DateTime-TimeZone-1.83-Parse-etc-localtime-by-DateTime-TimeZone-Tzfile.patch
BuildArch: noarch BuildArch: noarch
# Build # Build
BuildRequires: perl BuildRequires: perl
@ -99,6 +99,9 @@ make test
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Thu Jan 29 2015 Petr Pisar <ppisar@redhat.com> - 1.83-3
- Rebase patch to remove a spurious back-up file
* Fri Jan 16 2015 Petr Pisar <ppisar@redhat.com> - 1.83-2 * Fri Jan 16 2015 Petr Pisar <ppisar@redhat.com> - 1.83-2
- Fix dependency filtering - Fix dependency filtering