[tzdata/f14] Upstream 2011l:

[Petr Machata]

commit fecaadd1794376239ab132a56abb355d508c369f
Author: Petr Machata <pmachata at redhat.com>
Date:   Tue Oct 11 16:29:34 2011 +0200

    Upstream 2011l:
    
    - Fix ancient stamps for America/Sitka
    - Asia/Hebron transitioned to standard time already on Sep 30, not Oct 3
    - Fiji will introduce DST on Oct 22

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 tzdata-2011j-k.patch                               |  451 --------------------
 ...j-kemerovo.patch => tzdata-2011l-kemerovo.patch |    4 +-
 tzdata.spec                                        |   16 +-
 5 files changed, 14 insertions(+), 460 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff3ccb8..025ac80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@ noarch/
 /tzdata2011i.tar.gz
 /tzcode2011i.tar.gz
 /tzdata2011j.tar.gz
+/tzdata2011l.tar.gz
diff --git a/sources b/sources
index c38fd86..38f7a00 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
 cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
-30a6bebdbdd03c5bd29241c15f569d50  tzdata2011j.tar.gz
+bae1b93673e1aef80186c90dfd493f1c  tzdata2011l.tar.gz
diff --git a/tzdata-2011j-kemerovo.patch b/tzdata-2011l-kemerovo.patch
similarity index 81%
rename from tzdata-2011j-kemerovo.patch
rename to tzdata-2011l-kemerovo.patch
index bd515ad..17a44e6 100644
--- a/tzdata-2011j-kemerovo.patch
+++ b/tzdata-2011l-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011h/europe\~ tzdata2011h/europe
---- tzdata2011j/europe~	2011-06-15 13:31:00.000000000 +0200
-+++ tzdata2011j/europe	2011-06-27 16:49:39.323493224 +0200
+--- tzdata2011l/europe~	2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011l/europe	2011-06-27 16:49:39.323493224 +0200
 @@ -2158,8 +2158,8 @@ 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 f3a4c2f..c707f2d 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011k
-%define tzdata_version 2011j
+Version: 2011l
+%define tzdata_version 2011l
 %define tzcode_version 2011i
-Release: 0.1.20110921%{?dist}
+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-2011j-kemerovo.patch
-Patch2: tzdata-2011j-k.patch
+Patch1: tzdata-2011l-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,12 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Oct 11 2011 Petr Machata <pmachata at redhat.com> - 2011l-1
+- Upstream 2011l:
+  - Fix ancient stamps for America/Sitka
+  - Asia/Hebron transitioned to standard time already on Sep 30, not Oct 3
+  - Fiji will introduce DST on Oct 22
+
 * Wed Sep 21 2011 Petr Machata <pmachata at redhat.com> - 2011k-0.1.20110921
 - Upstream 2011j:
   - Fix the Samoa date line skip