From 3c1d1802e6a742d0e5a1d851a3979d11c7da2975 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@redhat.com>
Date: Tue, 26 Apr 2011 15:25:46 +0200
Subject: [PATCH] - Upstream 2011g:   - Egypt abandons DST in 2011 (and
 forward)

---
 .gitignore                                           |  4 ++++
 sources                                              |  4 ++--
 ...11f-kemerovo.patch => tzdata-2011g-kemerovo.patch |  6 +++---
 tzdata.spec                                          | 12 ++++++++----
 4 files changed, 17 insertions(+), 9 deletions(-)
 rename tzdata-2011f-kemerovo.patch => tzdata-2011g-kemerovo.patch (71%)

diff --git a/.gitignore b/.gitignore
index 611a385..1ef6dc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,7 @@ tzdata/
 /tzcode2011d.tar.gz
 /tzdata2011f.tar.gz
 /tzcode2011e.tar.gz
+/tzdata2011g.tar.gz
+/tzcode2011g.tar.gz
+noarch/
+.build-*
diff --git a/sources b/sources
index ff93047..b44920f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-cc8136284ae1e6c720a18e0f080242e0  tzdata2011f.tar.gz
-fbfc05dbf9ebcfe7c4bba18549870173  tzcode2011e.tar.gz
+a068c27e7e426fdb12ab0c88506df20d  tzdata2011g.tar.gz
+ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
diff --git a/tzdata-2011f-kemerovo.patch b/tzdata-2011g-kemerovo.patch
similarity index 71%
rename from tzdata-2011f-kemerovo.patch
rename to tzdata-2011g-kemerovo.patch
index 0abe4b8..a590c4f 100644
--- a/tzdata-2011f-kemerovo.patch
+++ b/tzdata-2011g-kemerovo.patch
@@ -1,6 +1,6 @@
-diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011f/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011f/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 8c02056..3f13e07 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011f
-%define tzdata_version 2011f
-%define tzcode_version 2011e
+Version: 2011g
+%define tzdata_version 2011g
+%define tzcode_version 2011g
 Release: 1%{?dist}
 License: Public Domain
 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
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011f-kemerovo.patch
+Patch1: tzdata-2011g-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,6 +113,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Apr 26 2011 Petr Machata <pmachata@redhat.com> - 2011g-1
+- Upstream 2011g:
+  - Egypt abandons DST in 2011 (and forward)
+
 * Wed Apr 20 2011 Petr Machata <pmachata@redhat.com> - 2011f-1
 - Upstream 2011e:
   - Canonical version of Chile and Morocco changes