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-2012c-morocco.patch b/tzdata-2012c-morocco.patch deleted file mode 100644 index 42c836e..0000000 --- a/tzdata-2012c-morocco.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up africa\~ africa ---- africa~ 2012-03-27 17:39:16.000000000 +0200 -+++ africa 2012-07-13 09:46:30.382276596 +0200 -@@ -826,6 +826,9 @@ Rule Morocco 2011 only - Apr 3 0:00 1: - Rule Morocco 2011 only - Jul 31 0 0 - - Rule Morocco 2012 max - Apr lastSun 2:00 1:00 S - Rule Morocco 2012 max - Sep lastSun 3:00 0 - -+# DST is suspended for the month of Ramadan -+Rule Morocco 2012 only - Jul 20 3:00 0 - -+Rule Morocco 2012 only - Aug 19 2:00 1:00 S - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 - -Diff finished. Fri Jul 13 09:46:38 2012 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 - 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 - 2012c-2 - Morocco will not observe DST during the month of Ramadan (tzdata-2012c-morocco.patch)