[tzdata] Upstream 2011d

[Petr Machata]

commit a6ebaa9169bdba00ea0dc6c768ccf974ef53f9cf
Author: Petr Machata <pmachata at redhat.com>
Date:   Tue Mar 15 10:40:05 2011 +0100

    Upstream 2011d
    
    - Change end of DST in Samoa in 2011.
    - Change start of DST in Cuba in 2011.
    - Move start of DST in Turkey by one day in 2011.

 .gitignore                                         |    2 +
 sources                                            |    4 +-
 tzdata-2011b-c.patch                               |  303 --------------------
 ...b-kemerovo.patch => tzdata-2011d-kemerovo.patch |    4 +-
 tzdata.spec                                        |   19 +-
 5 files changed, 18 insertions(+), 314 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c031c4a..43b23e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,5 @@ tzdata2010l.tar.gz
 /tzcode2011b.tar.gz
 tzdata/
 *.rpm
+/tzdata2011d.tar.gz
+/tzcode2011d.tar.gz
diff --git a/sources b/sources
index 1d8dadd..4e8ee12 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-9eaf3ca354c42a32bd28e623539bf0e0  tzdata2011b.tar.gz
-c63a1425f7252aef1fe54a258cdccff8  tzcode2011b.tar.gz
+03c5793502b7c41985edd73146bf7e36  tzdata2011d.tar.gz
+95095242ee368e6a7e107f154590ac11  tzcode2011d.tar.gz
diff --git a/tzdata-2011b-kemerovo.patch b/tzdata-2011d-kemerovo.patch
similarity index 79%
rename from tzdata-2011b-kemerovo.patch
rename to tzdata-2011d-kemerovo.patch
index 2310c6e..7c4fecd 100644
--- a/tzdata-2011b-kemerovo.patch
+++ b/tzdata-2011d-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011b/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011b/europe	2011-03-04 00:11:25.000000000 +0100
+--- tzdata2011d/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011d/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 168d909..ea8d4dd 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011b
-%define tzdata_version 2011b
-%define tzcode_version 2011b
-Release: 4%{?dist}
+Version: 2011d
+%define tzdata_version 2011d
+%define tzcode_version 2011d
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,8 +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-2011b-c.patch
-Patch2: tzdata-2011b-kemerovo.patch
+Patch1: tzdata-2011d-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +113,13 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Mar 15 2011 Petr Machata <pmachata at redhat.com> - 2011d-1
+- Upstream 2011d:
+  - Change end of DST in Samoa in 2011.
+  - Change start of DST in Cuba in 2011.
+  - Move start of DST in Turkey by one day in 2011.
+- Dropped tzdata-2011b-c.patch
+
 * Fri Mar 04 2011 Petr Machata <pmachata at redhat.com> - 2011b-4
 - Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)