Rebase to 2011n
This commit is contained in:
Petr Machata
parent
0acc4ba06f
commit
da082e26ff
1
.gitignore
vendored
1
.gitignore
vendored
@ -68,3 +68,4 @@ noarch/
|
|||||||
/tzcode2011i.tar.gz
|
/tzcode2011i.tar.gz
|
||||||
/tzdata2011j.tar.gz
|
/tzdata2011j.tar.gz
|
||||||
/tzdata2011l.tar.gz
|
/tzdata2011l.tar.gz
|
||||||
|
/tzdata2011n.tar.gz
|
||||||
|
|||||||
2
sources
2
sources
@ -1,4 +1,4 @@
|
|||||||
6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz
|
6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz
|
||||||
e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2
|
e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2
|
||||||
cf7f4335b7c8682899fa2814e711c1b2 tzcode2011i.tar.gz
|
cf7f4335b7c8682899fa2814e711c1b2 tzcode2011i.tar.gz
|
||||||
bae1b93673e1aef80186c90dfd493f1c tzdata2011l.tar.gz
|
20dbfb28efa008ddbf6dd34601ea40fa tzdata2011n.tar.gz
|
||||||
|
|||||||
@ -1,76 +0,0 @@
|
|||||||
commit 4182c08d1b5d3bc82e834f645abef670d1776659
|
|
||||||
Author: tz <tz@elsie.nci.nih.gov>
|
|
||||||
Date: Mon Sep 26 21:30:36 2011 +0200
|
|
||||||
diff --git a/europe b/europe
|
|
||||||
index baed8fe..a2ec972 100644
|
|
||||||
--- tzdata2011l/europe
|
|
||||||
+++ tzdata2011l/europe
|
|
||||||
@@ -2613,28 +2630,6 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
|
|
||||||
# of March at 3am the time is changing to 4am and each last Sunday of
|
|
||||||
# October the time at 4am is changing to 3am"
|
|
||||||
|
|
||||||
-# From Alexander Krivenyshev (2011-09-20):
|
|
||||||
-# On September 20, 2011 the deputies of the Verkhovna Rada agreed to
|
|
||||||
-# abolish the transfer clock to winter time.
|
|
||||||
-#
|
|
||||||
-# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
|
|
||||||
-# approval from 266 deputies.
|
|
||||||
-#
|
|
||||||
-# Ukraine abolishes transter back to the winter time (in Russian)
|
|
||||||
-# <a href="http://news.mail.ru/politics/6861560/">
|
|
||||||
-# http://news.mail.ru/politics/6861560/
|
|
||||||
-# </a>
|
|
||||||
-#
|
|
||||||
-# The Ukrainians will no longer change the clock (in Russian)
|
|
||||||
-# <a href="http://www.segodnya.ua/news/14290482.html">
|
|
||||||
-# http://www.segodnya.ua/news/14290482.html
|
|
||||||
-# </a>
|
|
||||||
-#
|
|
||||||
-# Deputies cancelled the winter time (in Russian)
|
|
||||||
-# <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">
|
|
||||||
-# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
|
|
||||||
-# </a>
|
|
||||||
-
|
|
||||||
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
|
|
||||||
# Most of Ukraine since 1970 has been like Kiev.
|
|
||||||
# "Kyiv" is the transliteration of the Ukrainian name, but
|
|
||||||
@@ -2626,8 +2665,7 @@ Zone Europe/Kiev 2:02:04 - LMT 1880
|
|
||||||
3:00 - MSK 1990 Jul 1 2:00
|
|
||||||
2:00 - EET 1992
|
|
||||||
2:00 E-Eur EE%sT 1995
|
|
||||||
+ 2:00 EU EE%sT
|
|
||||||
- 2:00 EU EE%sT 2011 Mar lastSun 1:00u
|
|
||||||
- 3:00 - FET # Further-eastern European Time
|
|
||||||
# Ruthenia used CET 1990/1991.
|
|
||||||
# "Uzhhorod" is the transliteration of the Ukrainian name, but
|
|
||||||
# "Uzhgorod" is more common in English.
|
|
||||||
@@ -2640,8 +2680,7 @@ Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
|
|
||||||
1:00 - CET 1991 Mar 31 3:00
|
|
||||||
2:00 - EET 1992
|
|
||||||
2:00 E-Eur EE%sT 1995
|
|
||||||
+ 2:00 EU EE%sT
|
|
||||||
- 2:00 EU EE%sT 2011 Mar lastSun 1:00u
|
|
||||||
- 3:00 - FET # Further-eastern European Time
|
|
||||||
# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
|
|
||||||
# "Zaporizhia" is the transliteration of the Ukrainian name, but
|
|
||||||
# "Zaporozh'ye" is more common in English. Use the common English
|
|
||||||
@@ -2653,8 +2694,7 @@ Zone Europe/Zaporozhye 2:20:40 - LMT 1880
|
|
||||||
1:00 C-Eur CE%sT 1943 Oct 25
|
|
||||||
3:00 Russia MSK/MSD 1991 Mar 31 2:00
|
|
||||||
2:00 E-Eur EE%sT 1995
|
|
||||||
+ 2:00 EU EE%sT
|
|
||||||
- 2:00 EU EE%sT 2011 Mar lastSun 1:00u
|
|
||||||
- 3:00 - FET # Further-eastern European Time
|
|
||||||
# Central Crimea used Moscow time 1994/1997.
|
|
||||||
Zone Europe/Simferopol 2:16:24 - LMT 1880
|
|
||||||
2:16 - SMT 1924 May 2 # Simferopol Mean T
|
|
||||||
@@ -2678,8 +2720,7 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880
|
|
||||||
# Assume it happened in March by not changing the clocks.
|
|
||||||
3:00 Russia MSK/MSD 1997
|
|
||||||
3:00 - MSK 1997 Mar lastSun 1:00u
|
|
||||||
+ 2:00 EU EE%sT
|
|
||||||
- 2:00 EU EE%sT 2011 Mar lastSun 1:00u
|
|
||||||
- 3:00 - FET # Further-eastern European Time
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
diff -up tzdata2011l/southamerica\~ tzdata2011l/southamerica
|
|
||||||
--- tzdata2011l/southamerica~ 2011-10-10 06:15:43.000000000 +0200
|
|
||||||
+++ tzdata2011l/southamerica 2011-10-14 16:40:35.679270087 +0200
|
|
||||||
@@ -1054,10 +1054,8 @@ Zone America/Maceio -2:22:52 - LMT 1914
|
|
||||||
# of America/Salvador.
|
|
||||||
Zone America/Bahia -2:34:04 - LMT 1914
|
|
||||||
-3:00 Brazil BR%sT 2003 Sep 24
|
|
||||||
- -3:00 - BRT
|
|
||||||
-# as noted above, not yet in operation.
|
|
||||||
-# -3:00 - BRT 2011 Oct 16
|
|
||||||
-# -3:00 Brazil BR%sT
|
|
||||||
+ -3:00 - BRT 2011 Oct 16
|
|
||||||
+ -3:00 Brazil BR%sT
|
|
||||||
#
|
|
||||||
# Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
|
|
||||||
# Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),
|
|
||||||
|
|
||||||
Diff finished. Fri Oct 14 16:40:40 2011
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
diff -up tzdata2011h/europe\~ tzdata2011h/europe
|
|
||||||
--- tzdata2011l/europe~ 2011-06-15 13:31:00.000000000 +0200
|
|
||||||
+++ tzdata2011l/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
|
|
||||||
20
tzdata.spec
20
tzdata.spec
@ -1,9 +1,9 @@
|
|||||||
Summary: Timezone data
|
Summary: Timezone data
|
||||||
Name: tzdata
|
Name: tzdata
|
||||||
Version: 2011l
|
Version: 2011n
|
||||||
%define tzdata_version 2011l
|
%define tzdata_version 2011n
|
||||||
%define tzcode_version 2011i
|
%define tzcode_version 2011i
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
URL: ftp://munnari.oz.au/pub/
|
URL: ftp://munnari.oz.au/pub/
|
||||||
@ -17,9 +17,6 @@ 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-2011l-kemerovo.patch
|
|
||||||
Patch2: tzdata-2011l-brazil.patch
|
|
||||||
Patch3: tzdata-2011j-ukraine.patch
|
|
||||||
# __end
|
# __end
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -53,9 +50,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
|
|||||||
-e 's|@datadir@|%{_datadir}|' \
|
-e 's|@datadir@|%{_datadir}|' \
|
||||||
Makeconfig.in > Makeconfig
|
Makeconfig.in > Makeconfig
|
||||||
# __apply_patches
|
# __apply_patches
|
||||||
%patch1 -p0
|
|
||||||
%patch2 -p0
|
|
||||||
%patch3 -p0
|
|
||||||
# __end
|
# __end
|
||||||
|
|
||||||
mkdir javazic
|
mkdir javazic
|
||||||
@ -117,6 +111,14 @@ rm -rf %{buildroot}
|
|||||||
%{_datadir}/javazi
|
%{_datadir}/javazi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 31 2011 Petr Machata <pmachata@redhat.com> - 2011l-1
|
||||||
|
- Rebase to 2011n
|
||||||
|
- Drop all patches, including the Kemerovo patch, which is not in
|
||||||
|
upstream
|
||||||
|
- Cuba postponed DST by two weeks to Nov 13
|
||||||
|
- Fiji will enter DST on Jan 21
|
||||||
|
- Resolved: #748778
|
||||||
|
|
||||||
* Wed Oct 19 2011 Petr Machata <pmachata@redhat.com> - 2011l-3
|
* Wed Oct 19 2011 Petr Machata <pmachata@redhat.com> - 2011l-3
|
||||||
- Ukraine will enter Winter Time after all
|
- Ukraine will enter Winter Time after all
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user