rpms/tzdata
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f14

Browse Source
This commit is contained in:
Petr Machata 2011-06-27 16:51:46 +02:00
commit 48ec161347
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tzdata-2011g-kemerovo.patch
View File

@ -1,14 +0,0 @@
diff -up tzdata2011g/europe\~ tzdata2011g/europe
--- tzdata2011g/europe~ 2010-12-16 18:24:20.000000000 +0100
+++ tzdata2011g/europe 2011-03-04 00:11:25.000000000 +0100
@@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk 5:48:48 - NMT 19
7:00 Russia KRA%sT 1991 Mar 31 2:00s
6:00 Russia KRA%sT 1992 Jan 19 2:00s
7:00 Russia KRA%sT 2010 Mar 28 2:00s
- 6:00 Russia NOV%sT # Novosibirsk/Novokuznetsk Time
+ 6:00 Russia OMS%sT # Novosibirsk/Novokuznetsk Time
#
# From Oscar van Vlijmen (2001-08-25): [This region consists of]
Diff finished. Fri Mar 4 00:11:35 2011

16
tzdata-2011h-kemerovo.patch Normal file
View File

@ -0,0 +1,16 @@
diff -up tzdata2011h/europe\~ tzdata2011h/europe
--- tzdata2011h/europe~ 2011-06-15 13:31:00.000000000 +0200
+++ tzdata2011h/europe 2011-06-27 16:49:39.323493224 +0200
@@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk 5:48:48 - NMT 19
7:00 Russia KRA%sT 1991 Mar 31 2:00s
6:00 Russia KRA%sT 1992 Jan 19 2:00s
7:00 Russia KRA%sT 2010 Mar 28 2:00s
- 6:00 Russia NOV%sT 2011 Mar 27 2:00s
- 7:00 - NOVT # Novosibirsk/Novokuznetsk Time
+ 6:00 Russia OMS%sT 2011 Mar 27 2:00s
+ 7:00 - OMST # Novosibirsk/Novokuznetsk Time
#
# From Oscar van Vlijmen (2001-08-25): [This region consists of]
Diff finished. Mon Jun 27 16:49:45 2011

6
tzdata.spec
View File

@ -1,8 +1,8 @@
Summary: Timezone data Summary: Timezone data
Name: tzdata Name: tzdata
Version: 2011h Version: 2011h
%define tzdata_version 2011g %define tzdata_version 2011h
%define tzcode_version 2011h %define tzcode_version 2011g
Release: 1%{?dist} Release: 1%{?dist}
License: Public Domain License: Public Domain
Group: System Environment/Base Group: System Environment/Base
@ -17,7 +17,7 @@ Source0: tzdata-base-0.tar.bz2
Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
# __decl_patches # __decl_patches
Patch1: tzdata-2011g-kemerovo.patch Patch1: tzdata-2011h-kemerovo.patch
# __end # __end
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)