[tzdata/f15] Rebase to 2012b

[Petr Machata]

commit d7aeec37608645595a7badc571380ae478d1c049
Author: Petr Machata <pmachata at redhat.com>
Date:   Wed Mar 7 00:10:29 2012 +0100

    Rebase to 2012b
    
    - Changes to zones for Antarctica stations
    - Armenia abolished DST in 2012 and forward
    - Cuba enters DST on 31st March
    - Falkland Islands will stay on permanent Summer Time
    - New zone for Creston Valley, Canada, which differs from Dawson
      Creek in past stamps.  Changes to historical stamps in Canada.
    - Last year, Tokelau skipped over the date line together with Samoa

 .gitignore                 |    2 +
 sources                    |    4 +-
 tzdata-2011n-chile.patch   |   43 ------------------------
 tzdata-2011n-leapsec.patch |   77 --------------------------------------------
 tzdata.spec                |   22 ++++++++----
 5 files changed, 18 insertions(+), 130 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e0ecd1..2d6b2c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,5 @@ noarch/
 /tzdata2011j.tar.gz
 /tzdata2011l.tar.gz
 /tzdata2011n.tar.gz
+/tzdata2012b.tar.gz
+/tzcode2012b.tar.gz
diff --git a/sources b/sources
index 34317a8..ffecb40 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
-20dbfb28efa008ddbf6dd34601ea40fa  tzdata2011n.tar.gz
+0615fd29def380a917e528433c820368  tzdata2012b.tar.gz
+6137322ffd36e1fd5128885be1c57008  tzcode2012b.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 9677d08..ec1d4ef 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011n
-%define tzdata_version 2011n
-%define tzcode_version 2011i
-Release: 4%{?dist}
+Version: 2012b
+%define tzdata_version 2012b
+%define tzcode_version 2012b
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -17,8 +17,6 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://munnari.oz.au/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://munnari.oz.au/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch0: tzdata-2011n-leapsec.patch
-Patch1: tzdata-2011n-chile.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,8 +53,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 
 pushd tzdata%{tzdata_version}
 # __apply_patches
-%patch0 -p0
-%patch1 -p0
 # __end
 popd
 
@@ -120,6 +116,16 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Mar  6 2012 Petr Machata <pmachata at redhat.com> - 2012b-1
+- Rebase to 2012b; changes vs. 2011n-4:
+  - Changes to zones for Antarctica stations
+  - Armenia abolished DST in 2012 and forward
+  - Cuba enters DST on 31st March
+  - Falkland Islands will stay on permanent Summer Time
+  - New zone for Creston Valley, Canada, which differs from Dawson
+    Creek in past stamps.  Changes to historical stamps in Canada.
+  - Last year, Tokelau skipped over the date line together with Samoa
+
 * Fri Feb 24 2012 Petr Machata <pmachata at redhat.com> - 2011n-4
 - Add a patch for change in Chilean DST
 - Update URLs