[tzdata/f14] Rebase to 2011n

[Petr Machata]

commit da082e26ffff27a5bb298013a73b2e903f28832d
Author: Petr Machata <pmachata at redhat.com>
Date:   Mon Oct 31 16:04:44 2011 +0100

    Rebase to 2011n

 .gitignore                  |    1 +
 sources                     |    2 +-
 tzdata-2011j-ukraine.patch  |   76 -------------------------------------------
 tzdata-2011l-brazil.patch   |   18 ----------
 tzdata-2011l-kemerovo.patch |   16 ---------
 tzdata.spec                 |   20 ++++++-----
 6 files changed, 13 insertions(+), 120 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 025ac80..5e0ecd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,4 @@ noarch/
 /tzcode2011i.tar.gz
 /tzdata2011j.tar.gz
 /tzdata2011l.tar.gz
+/tzdata2011n.tar.gz
diff --git a/sources b/sources
index 38f7a00..34317a8 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
 cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
-bae1b93673e1aef80186c90dfd493f1c  tzdata2011l.tar.gz
+20dbfb28efa008ddbf6dd34601ea40fa  tzdata2011n.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 3cc4f50..a3b613e 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011l
-%define tzdata_version 2011l
+Version: 2011n
+%define tzdata_version 2011n
 %define tzcode_version 2011i
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -17,9 +17,6 @@ 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-2011l-kemerovo.patch
-Patch2: tzdata-2011l-brazil.patch
-Patch3: tzdata-2011j-ukraine.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,9 +50,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
 # __end
 
 mkdir javazic
@@ -117,6 +111,14 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Oct 31 2011 Petr Machata <pmachata at redhat.com> - 2011l-1
+- Rebase to 2011n
+  - Drop all patches, including the Kemerovo patch, which is not in
+    upstream
+  - Cuba postponed DST by two weeks to Nov 13
+  - Fiji will enter DST on Jan 21
+- Resolved: #748778
+
 * Wed Oct 19 2011 Petr Machata <pmachata at redhat.com> - 2011l-3
 - Ukraine will enter Winter Time after all