Patch for upcoming change in Newfoundland

This commit is contained in:
Petr Machata 2011-08-10 22:46:34 +02:00
parent 48ec161347
commit e9c65d9121
2 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,22 @@
--- tzdata2011h/northamerica~ 2011-06-15 11:05:20.000000000 +0000
+++ tzdata2011h/northamerica 2011-08-05 20:04:17.000000000 +0000
@@ -1178,7 +1178,8 @@
-3:30:52 StJohns N%sT 1935 Mar 30
-3:30 StJohns N%sT 1942 May 11
-3:30 Canada N%sT 1946
- -3:30 StJohns N%sT
+ -3:30 StJohns N%sT 2011 Nov 6
+ -3:30 Canada N%sT
# most of east Labrador
@@ -1192,7 +1193,8 @@
-3:30 StJohns N%sT 1942 May 11
-3:30 Canada N%sT 1946
-3:30 StJohns N%sT 1966 Mar 15 2:00
- -4:00 StJohns A%sT
+ -4:00 StJohns A%sT 2011 Nov 6
+ -4:00 Canada A%sT
# west Labrador, Nova Scotia, Prince Edward I

View File

@ -3,7 +3,7 @@ Name: tzdata
Version: 2011h
%define tzdata_version 2011h
%define tzcode_version 2011g
Release: 1%{?dist}
Release: 2%{?dist}
License: Public Domain
Group: System Environment/Base
URL: ftp://elsie.nci.nih.gov/pub/
@ -18,6 +18,7 @@ Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
# __decl_patches
Patch1: tzdata-2011h-kemerovo.patch
Patch2: tzdata-2011h-labrador.patch
# __end
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
Makeconfig.in > Makeconfig
# __apply_patches
%patch1 -p0
%patch2 -p0
# __end
mkdir javazic
@ -113,6 +115,10 @@ rm -rf %{buildroot}
%{_datadir}/javazi
%changelog
* Wed Aug 10 2011 Petr Machata <pmachata@redhat.com> - 2011h-2
- Patch for upcoming change in Newfoundland. The transition time
changes from 12:01 AM to 2:00 AM.
* Mon Jun 27 2011 Petr Machata <pmachata@redhat.com> - 2011h-1
- Upstream 2011h:
- Russia abandons DST in 2011.