[tzdata/f15/master] Rebase to 2011g

[Petr Machata]

commit 3793ae4790f7efbe54c16a5f9f42c5aa5707c440
Author: Petr Machata <pmachata at redhat.com>
Date:   Tue Apr 26 15:29:01 2011 +0200

    Rebase to 2011g
    
    - Upstream 2011e:
      - Morocco introduced DST for 2011 from April 2 to July 31.
      - Delay end of DST in Chile in 2011 until May 7.
    - Upstream 2011f:
      - The Falkland Islands will not turn back clocks this winter, but
        stay on daylight saving time.
    - Upstream 2011g:
      - Egypt abandons DST in 2011 (and forward)
    - Dropped tzdata-2011d-chile.patch
    - Dropped tzdata-2011d-morocco.patch

 sources                                            |    4 +-
 tzdata-2011d-chile.patch                           |   19 --------------
 tzdata-2011d-morocco.patch                         |   15 -----------
 ...d-kemerovo.patch => tzdata-2011g-kemerovo.patch |    6 ++--
 tzdata.spec                                        |   26 +++++++++++++-------
 5 files changed, 22 insertions(+), 48 deletions(-)
---
diff --git a/sources b/sources
index 4e8ee12..ff93047 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-03c5793502b7c41985edd73146bf7e36  tzdata2011d.tar.gz
-95095242ee368e6a7e107f154590ac11  tzcode2011d.tar.gz
+cc8136284ae1e6c720a18e0f080242e0  tzdata2011f.tar.gz
+fbfc05dbf9ebcfe7c4bba18549870173  tzcode2011e.tar.gz
diff --git a/tzdata-2011d-kemerovo.patch b/tzdata-2011g-kemerovo.patch
similarity index 71%
rename from tzdata-2011d-kemerovo.patch
rename to tzdata-2011g-kemerovo.patch
index 7c4fecd..a590c4f 100644
--- a/tzdata-2011d-kemerovo.patch
+++ b/tzdata-2011g-kemerovo.patch
@@ -1,6 +1,6 @@
-diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011d/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011d/europe	2011-03-04 00:11:25.000000000 +0100
+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
diff --git a/tzdata.spec b/tzdata.spec
index f2ce2f0..23da033 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011d
-%define tzdata_version 2011d
-%define tzcode_version 2011d
-Release: 3%{?dist}
+Version: 2011g
+%define tzdata_version 2011g
+%define tzcode_version 2011g
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,9 +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-2011d-chile.patch
-Patch2: tzdata-2011d-kemerovo.patch
-Patch3: tzdata-2011d-morocco.patch
+Patch1: tzdata-2011g-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,8 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
-%patch3 -p0
 # __end
 
 mkdir javazic
@@ -117,6 +113,18 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Apr 26 2011 Petr Machata <pmachata at redhat.com> - 2011g-1
+- Upstream 2011e:
+  - Morocco introduced DST for 2011 from April 2 to July 31.
+  - Delay end of DST in Chile in 2011 until May 7.
+- Upstream 2011f:
+  - The Falkland Islands will not turn back clocks this winter, but
+    stay on daylight saving time.
+- Upstream 2011g:
+  - Egypt abandons DST in 2011 (and forward)
+- Dropped tzdata-2011d-chile.patch
+- Dropped tzdata-2011d-morocco.patch
+
 * Wed Mar 30 2011 Petr Machata <pmachata at redhat.com> - 2011d-3
 - Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch)