diff --git a/.cvsignore b/.cvsignore
index be1a9b9..194104b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -36,3 +36,5 @@ tzcode2009t.tar.gz
tzdata2010c.tar.gz
tzcode2010c.tar.gz
tzdata2010e.tar.gz
+tzcode2010f.tar.gz
+tzdata2010f.tar.gz
diff --git a/sources b/sources
index 504ab26..2f5f3bf 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz
e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2
-a3021ce84b46bf57627dade2451949b6 tzcode2010c.tar.gz
-8e179c56fd18c0f85dfa4ac4bf828b42 tzdata2010e.tar.gz
+e530cc9bbdfd5e8c1eac21a68f4d5656 tzcode2010f.tar.gz
+4a0e2a3594210fafc5c55b5247018618 tzdata2010f.tar.gz
diff --git a/tzdata-2010f-g.patch b/tzdata-2010f-g.patch
new file mode 100644
index 0000000..b54b2e2
--- /dev/null
+++ b/tzdata-2010f-g.patch
@@ -0,0 +1,274 @@
+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
+*** old/asia Wed Mar 17 10:33:04 2010
+--- new/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
+*** old/europe Wed Jan 6 10:21:33 2010
+--- new/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
+*** old/zone.tab Wed Mar 17 11:01:07 2010
+--- new/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.spec b/tzdata.spec
index 5db0b4c..0ac1f8f 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
Summary: Timezone data
Name: tzdata
-Version: 2010e
-%define tzdata_version 2010e
-%define tzcode_version 2010c
+Version: 2010f
+%define tzdata_version 2010f
+%define tzcode_version 2010f
Release: 1%{?dist}
License: Public Domain
Group: System Environment/Base
@@ -17,6 +17,7 @@ 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
# __end
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
-e 's|@datadir@|%{_datadir}|' \
Makeconfig.in > Makeconfig
# __apply_patches
+%patch1 -p1
# __end
mkdir javazic
@@ -111,6 +113,21 @@ rm -rf %{buildroot}
%{_datadir}/javazi
%changelog
+* Thu Mar 25 2010 Petr Machata - 2010f-1
+- Upstream 2010f:
+ - Changes to Australian stations in Antarctica
+ - Correct 2010 Samoa DST start date
+ - New zone Antarctica/Macquarie
+ - Change Syria DST start from last Friday in March to first Friday
+ in April in 2010 and forward
+- Upstream 2010g proposal (tzdata-2010f-g.patch):
+ - 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
+
+
* Tue Mar 09 2010 Petr Machata - 2010e-1
- Upstream 2010d
- The DST change in Bangladesh takes place a minute earlier