[tzdata/f16] Upstream 2012d

[Petr Machata]

commit 732af67d3feecc519addb4d1b1165ffcd90b6286
Author: Petr Machata <pmachata at redhat.com>
Date:   Fri Jul 20 16:04:49 2012 +0200

    Upstream 2012d
    
    changed zones (vs. 2012c-2)
      Africa/Casablanca
         Moved WEST (UTC+1, dst) from 19th Aug 2012 02:00:00 to 20th

 .gitignore                 |    2 ++
 sources                    |    4 ++--
 tzdata-2012c-morocco.patch |   15 ---------------
 tzdata.spec                |   15 +++++++++------
 4 files changed, 13 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4070452..e8c1e2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,5 @@ noarch/
 /tzdata2012b.tar.gz
 /tzcode2012b.tar.gz
 /tzdata2012c.tar.gz
+/tzcode2012c.tar.gz
+/tzdata2012d.tar.gz
diff --git a/sources b/sources
index cc80aaa..3a646b8 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-6137322ffd36e1fd5128885be1c57008  tzcode2012b.tar.gz
-cfdc2710bd05c26dbd624441d57028f6  tzdata2012c.tar.gz
+f0873d819e886ecc0b116f5f086e23d1  tzcode2012c.tar.gz
+fc0f54b76054800394f8c366ea1eeea7  tzdata2012d.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 1264da7..6b5d289 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2012c
-%define tzdata_version 2012c
-%define tzcode_version 2012b
-Release: 2%{?dist}
+Version: 2012d
+%define tzdata_version 2012d
+%define tzcode_version 2012c
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -17,7 +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
-Patch1: tzdata-2012c-morocco.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,7 +53,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 
 pushd tzdata%{tzdata_version}
 # __apply_patches
-%patch1
 # __end
 popd
 
@@ -118,6 +116,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Fri Jul 20 2012 Petr Machata <pmachata at redhat.com> - 2012d-1
+- Upstream 2012d
+  - Morocco will not observe DST during the month of Ramadan.
+    DST cessation end date was corrected.
+
 * Fri Jul 13 2012 Petr Machata <pmachata at redhat.com> - 2012c-2
 - Morocco will not observe DST during the month of Ramadan
   (tzdata-2012c-morocco.patch)