diff --git a/.cvsignore b/.cvsignore
index 194104b..57602d8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -38,3 +38,4 @@ tzcode2010c.tar.gz
tzdata2010e.tar.gz
tzcode2010f.tar.gz
tzdata2010f.tar.gz
+tzdata2010h.tar.gz
diff --git a/sources b/sources
index 2f5f3bf..43e4048 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz
e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2
-e530cc9bbdfd5e8c1eac21a68f4d5656 tzcode2010f.tar.gz
-4a0e2a3594210fafc5c55b5247018618 tzdata2010f.tar.gz
+d384ac091e6d56802f9b3e6b3d3f0f2e tzdata2010h.tar.gz
diff --git a/tzdata-2010f-g.patch b/tzdata-2010f-g.patch
deleted file mode 100644
index 70d20d7..0000000
--- a/tzdata-2010f-g.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-Below are proposed time zone package changes; here's the executive summary:
- asia No Bangladesh DST in 2010 and forward.
- Gaza DST starts last Saturday in March at 12:01 a.m.
- in 2010 and forward.
- europe Kamchaatka changes to Moscow+8 on 2010-03-28.
- Anadyr changes to Moscow+8 on 2010-03-28.
- Samara changes to Moscow on 2010-03-28.
- zone.tab Kamchatka changes to Moscow+8.
- Anadyr changes to Moscow+8.
- Samara changes to Moscow.
-
-(Note that Kemerovo changes were made previously and that, for time zone
-purposes, Udmurt is included within Samara.)
-
-If no problems are found, these will appear on the ftp site on 2010-03-29.
-
- --ado
-
-diff -r -c old/asia new/asia
-*** tzdata2010f/asia Wed Mar 17 10:33:04 2010
---- tzdata2010f/asia Wed Mar 24 10:51:17 2010
-***************
-*** 1,4 ****
-! # @(#)asia 8.56
- # This file is in the public domain, so clarified as of
- # 2009-05-17 by Arthur David Olson.
-
---- 1,4 ----
-! # @(#)asia 8.58
- # This file is in the public domain, so clarified as of
- # 2009-05-17 by Arthur David Olson.
-
-***************
-*** 214,255 ****
- # 2010 midnight. The decision came at a cabinet meeting at the Prime
- # Minister's Office last night..."
-
-! # From Danvin Ruangchan (2009-12-24):
-! # ...the news mentions DST will be turned off again 7 months after March
-! # 31st on Oct 31, 2010.
-!
-! # From Arthur David Olson (2009-12-26):
-! # Indeed, "The government will advance again the Banglasdesh Standard
-! # Time by one one hour on March 31 next year by enforcing the Daylight
-! # Saving Time (DST) for seven months. It will continue till October 31
-! # until further notice." I take that last sentence as the
-! # establishment of a rule.
-!
-! # From Nobutomo Nakano (2010-02-19):
-! # We received a report from Bangladesh saying that the start/end of
-! # Bangladesh DST is incorrect. Currently we have only the Bengali version
-! # of the official mail from BTRC which describes the following:
-! #
-! # "From 2010 each year when local standard time is about to reach
-! # March 31 at 10:59:00 PM clocks are turned forward 1 hour (11:59:00 PM)
-! # and when local daylight time is about to October 31 at 11:59:00 PM
-! # clocks are turned backward 1 hour (10:59:00 PM)."
-! #
-! # So, DST will start/end 1 minute earlier.
-!
-! # From Arthur David Olson (2010-03-03):
-! # The file
-! #
-! # http://www.cabinet.gov/bd/file_upload/news_events/en_169.pdf
- #
-! # is in Bengali; it does contain two "31"s as well as two "11.59"s and a "10.59"
-! # which is consistent with the information provided by Nobutomo Nakano.
-
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Dhaka 2009 only - Jun 19 23:00 1:00 S
- Rule Dhaka 2009 only - Dec 31 23:59 0 -
-- Rule Dhaka 2010 max - Mar 31 22:59 1:00 S
-- Rule Dhaka 2010 max - Oct 31 23:59 0 -
-
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Asia/Dhaka 6:01:40 - LMT 1890
---- 214,233 ----
- # 2010 midnight. The decision came at a cabinet meeting at the Prime
- # Minister's Office last night..."
-
-! # From Alexander Krivenyshev (2010-03-22):
-! # According to Bangladesh newspaper "The Daily Star,"
-! # Cabinet cancels Daylight Saving Time
-! #
-! # http://www.thedailystar.net/newDesign/latest_news.php?nid=22817
- #
-! # or
-! #
-! # http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
-! #
-
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Dhaka 2009 only - Jun 19 23:00 1:00 S
- Rule Dhaka 2009 only - Dec 31 23:59 0 -
-
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Asia/Dhaka 6:01:40 - LMT 1890
-***************
-*** 2129,2134 ****
---- 2107,2138 ----
- # http://www.worldtimezone.com/dst_news/dst_news_gazastrip02.html
- #
-
-+ # From Alexander Krivenyshev (2010-03-19):
-+ # According to Voice of Palestine DST will last for 191 days, from March
-+ # 26, 2010 till "the last Sunday before the tenth day of Tishri
-+ # (October), each year" (October 03, 2010?)
-+ #
-+ #
-+ # http://palvoice.org/forums/showthread.php?t=245697
-+ #
-+ # (in Arabic)
-+ # or
-+ #
-+ # http://www.worldtimezone.com/dst_news/dst_news_westbank03.html
-+ #
-+
-+ # From Steffen Thorsen (2010-03-24):
-+ # ...Ma'an News Agency reports that Hamas cabinet has decided it will
-+ # start one day later, at 12:01am. Not sure if they really mean 12:01am or
-+ # noon though:
-+ #
-+ #
-+ # http://www.maannews.net/eng/ViewDetails.aspx?ID=271178
-+ #
-+ # (Ma'an News Agency)
-+ # "At 12:01am Friday, clocks in Israel and the West Bank will change to
-+ # 1:01am, while Gaza clocks will change at 12:01am Saturday morning."
-+
- # The rules for Egypt are stolen from the `africa' file.
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
-***************
-*** 2146,2152 ****
- Rule Palestine 2006 only - Sep 22 0:00 0 -
- Rule Palestine 2007 only - Sep Thu>=8 2:00 0 -
- Rule Palestine 2008 only - Aug lastFri 2:00 0 -
-! Rule Palestine 2009 max - Mar lastFri 0:00 1:00 S
- Rule Palestine 2009 max - Sep Fri>=1 2:00 0 -
-
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
---- 2150,2157 ----
- Rule Palestine 2006 only - Sep 22 0:00 0 -
- Rule Palestine 2007 only - Sep Thu>=8 2:00 0 -
- Rule Palestine 2008 only - Aug lastFri 2:00 0 -
-! Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S
-! Rule Palestine 2010 max - Mar lastSat 0:01 1:00 S
- Rule Palestine 2009 max - Sep Fri>=1 2:00 0 -
-
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
-diff -r -c old/europe new/europe
-*** tzdata2010f/europe Wed Jan 6 10:21:33 2010
---- tzdata2010f/europe Wed Mar 24 11:14:53 2010
-***************
-*** 1,5 ****
- #
-! # @(#)europe 8.25
- # This file is in the public domain, so clarified as of
- # 2009-05-17 by Arthur David Olson.
-
---- 1,5 ----
- #
-! # @(#)europe 8.26
- # This file is in the public domain, so clarified as of
- # 2009-05-17 by Arthur David Olson.
-
-***************
-*** 2041,2047 ****
- 3:00 Russia KUY%sT 1991 Mar 31 2:00s
- 2:00 Russia KUY%sT 1991 Sep 29 2:00s
- 3:00 - KUYT 1991 Oct 20 3:00
-! 4:00 Russia SAM%sT # Samara Time
- #
- # From Oscar van Vlijmen (2001-08-25): [This region consists of]
- # Respublika Bashkortostan, Komi-Permyatskij avtonomnyj okrug,
---- 2041,2049 ----
- 3:00 Russia KUY%sT 1991 Mar 31 2:00s
- 2:00 Russia KUY%sT 1991 Sep 29 2:00s
- 3:00 - KUYT 1991 Oct 20 3:00
-! 4:00 Russia SAM%sT 2010 Mar 28 2:00s # Samara Time
-! 3:00 Russia SAM%sT
-!
- #
- # From Oscar van Vlijmen (2001-08-25): [This region consists of]
- # Respublika Bashkortostan, Komi-Permyatskij avtonomnyj okrug,
-***************
-*** 2194,2200 ****
- 11:00 - PETT 1930 Jun 21 # P-K Time
- 12:00 Russia PET%sT 1991 Mar 31 2:00s
- 11:00 Russia PET%sT 1992 Jan 19 2:00s
-! 12:00 Russia PET%sT
- #
- # Chukotskij avtonomnyj okrug
- Zone Asia/Anadyr 11:49:56 - LMT 1924 May 2
---- 2196,2203 ----
- 11:00 - PETT 1930 Jun 21 # P-K Time
- 12:00 Russia PET%sT 1991 Mar 31 2:00s
- 11:00 Russia PET%sT 1992 Jan 19 2:00s
-! 12:00 Russia PET%sT 2010 Mar 28 2:00s
-! 11:00 Russia PET%sT
- #
- # Chukotskij avtonomnyj okrug
- Zone Asia/Anadyr 11:49:56 - LMT 1924 May 2
-***************
-*** 2202,2208 ****
- 13:00 Russia ANA%sT 1982 Apr 1 0:00s
- 12:00 Russia ANA%sT 1991 Mar 31 2:00s
- 11:00 Russia ANA%sT 1992 Jan 19 2:00s
-! 12:00 Russia ANA%sT
-
- # Serbia
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
---- 2205,2212 ----
- 13:00 Russia ANA%sT 1982 Apr 1 0:00s
- 12:00 Russia ANA%sT 1991 Mar 31 2:00s
- 11:00 Russia ANA%sT 1992 Jan 19 2:00s
-! 12:00 Russia ANA%sT 2010 Mar 28 2:00s
-! 11:00 Russia ANA%sT
-
- # Serbia
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
-diff -r -c old/zone.tab new/zone.tab
-*** tzdata2010f/zone.tab Wed Mar 17 11:01:07 2010
---- tzdata2010f/zone.tab Wed Mar 24 11:14:53 2010
-***************
-*** 1,5 ****
- #
-! # @(#)zone.tab 8.34
- # This file is in the public domain, so clarified as of
- # 2009-05-17 by Arthur David Olson.
- #
---- 1,5 ----
- #
-! # @(#)zone.tab 8.35
- # This file is in the public domain, so clarified as of
- # 2009-05-17 by Arthur David Olson.
- #
-***************
-*** 330,336 ****
- RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad
- RU +5545+03735 Europe/Moscow Moscow+00 - west Russia
- RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
-! RU +5312+05009 Europe/Samara Moscow+01 - Samara, Udmurtia
- RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
- RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
- RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
---- 330,336 ----
- RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad
- RU +5545+03735 Europe/Moscow Moscow+00 - west Russia
- RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
-! RU +5312+05009 Europe/Samara Moscow - Samara, Udmurtia
- RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
- RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
- RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
-***************
-*** 341,348 ****
- RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River
- RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island
- RU +5934+15048 Asia/Magadan Moscow+08 - Magadan
-! RU +5301+15839 Asia/Kamchatka Moscow+09 - Kamchatka
-! RU +6445+17729 Asia/Anadyr Moscow+10 - Bering Sea
- RW -0157+03004 Africa/Kigali
- SA +2438+04643 Asia/Riyadh
- SB -0932+16012 Pacific/Guadalcanal
---- 341,348 ----
- RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River
- RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island
- RU +5934+15048 Asia/Magadan Moscow+08 - Magadan
-! RU +5301+15839 Asia/Kamchatka Moscow+08 - Kamchatka
-! RU +6445+17729 Asia/Anadyr Moscow+08 - Bering Sea
- RW -0157+03004 Africa/Kigali
- SA +2438+04643 Asia/Riyadh
- SB -0932+16012 Pacific/Guadalcanal
-
diff --git a/tzdata-2010g-karachi.patch b/tzdata-2010g-karachi.patch
deleted file mode 100644
index f706694..0000000
--- a/tzdata-2010g-karachi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/asia b/asia
-index 859d9c5..cd333c4 100644
---- tzdata2010f/asia
-+++ tzdata2010f/asia
-@@ -1934,13 +1934,19 @@ Zone Asia/Muscat 3:54:20 - LMT 1920
- # [T]he German Consulate General in Karachi reported me today that Pakistan
- # will go back to standard time on 1st of November.
-
-+# The government has reversed the plan to advance clocks from April 1 [2010].
-+# Prime Minister Yousuf Raza Gilani said in the National Assembly
-+# session that government will honour House' view and would not
-+# advance the clocks.
-+# http://www.apakistannews.com/govt-withdraws-plan-to-advance-clocks-172041
-+
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S
- Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 -
- Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
- Rule Pakistan 2008 only - Nov 1 0:00 0 -
--Rule Pakistan 2009 max - Apr 15 0:00 1:00 S
--Rule Pakistan 2009 max - Nov 1 0:00 0 -
-+Rule Pakistan 2009 only - Apr 15 0:00 1:00 S
-+Rule Pakistan 2009 only - Nov 1 0:00 0 -
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Asia/Karachi 4:28:12 - LMT 1907
- 5:30 - IST 1942 Sep
diff --git a/tzdata-2010g-tunis.patch b/tzdata-2010g-tunis.patch
deleted file mode 100644
index 4761ab0..0000000
--- a/tzdata-2010g-tunis.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/africa b/africa
-index ad89bb7..d94bd70 100644
---- tzdata2010f/africa
-+++ tzdata2010f/africa
-@@ -940,7 +940,6 @@ Zone Africa/Lome 0:04:52 - LMT 1893
- # The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
- # that the fasting month of ramadan coincides with the period concerned by summer time.
- # Therefore, the standard time will be kept unchanged the whole year long."
--# So foregoing DST seems to be an exception (albeit one that may be repeated in the future).
-
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Tunisia 1939 only - Apr 15 23:00s 1:00 S
-@@ -968,8 +967,6 @@ Rule Tunisia 2005 only - May 1 0:00s 1:00 S
- Rule Tunisia 2005 only - Sep 30 1:00s 0 -
- Rule Tunisia 2006 2008 - Mar lastSun 2:00s 1:00 S
- Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 -
--Rule Tunisia 2010 max - Mar lastSun 2:00s 1:00 S
--Rule Tunisia 2010 max - Oct lastSun 2:00s 0 -
- # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
- # more precise 0:09:21.
- # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
diff --git a/tzdata.spec b/tzdata.spec
index 58946a5..9e70718 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
Summary: Timezone data
Name: tzdata
-Version: 2010f
-%define tzdata_version 2010f
+Version: 2010h
+%define tzdata_version 2010h
%define tzcode_version 2010f
-Release: 3%{?dist}
+Release: 1%{?dist}
License: Public Domain
Group: System Environment/Base
URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,9 +17,6 @@ Source0: tzdata-base-0.tar.bz2
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-2010f-g.patch
-Patch2: tzdata-2010g-karachi.patch
-Patch3: tzdata-2010g-tunis.patch
# __end
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,9 +50,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
-e 's|@datadir@|%{_datadir}|' \
Makeconfig.in > Makeconfig
# __apply_patches
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
# __end
mkdir javazic
@@ -117,6 +111,21 @@ rm -rf %{buildroot}
%{_datadir}/javazi
%changelog
+* Tue Apr 06 2010 Petr Machata - 2010h-1
+- Upstream 2010g:
+ - No Bangladesh DST in 2010 and forward.
+ - Gaza DST starts last Saturday in March at 12:01 a.m. in 2010 and forward
+ - Kamchatka and Anadyr change to Moscow+8 on 2010-03-28
+ - Samara changes to Moscow+0 on 2010-03-28
+ - Related zone.tab updates
+- Upstream 2010h:
+ - No DST in Tunisia in 2010 and forward
+ - No DST in Pakistan in 2010 and forward
+- Dropped tzdata-2010g-tunis.patch
+- Dropped tzdata-2010f-g.patch
+- Dropped tzdata-2010g-karachi.patch
+
+
* Mon Mar 29 2010 Petr Machata - 2010f-3
- Tunisia not to observe DST in 2010 (tzdata-2010g-tunis.patch)
- Pakistan not to observe DST in 2010 (tzdata-2010g-karachi.patch)