From e7a5415a41d0c7159e7ddd6420c3f07bd4f62c8e Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 30 Mar 2011 17:57:55 +0200 Subject: [PATCH] Morocco introduced DST for 2011 from April 2 to July 31 --- tzdata-2011d-morocco.patch | 15 +++++++++++++++ tzdata.spec | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 tzdata-2011d-morocco.patch diff --git a/tzdata-2011d-morocco.patch b/tzdata-2011d-morocco.patch new file mode 100644 index 0000000..a619608 --- /dev/null +++ b/tzdata-2011d-morocco.patch @@ -0,0 +1,15 @@ +diff -up tzdata2011d/africa\~ tzdata2011d/africa +--- tzdata2011d/africa~ 2010-12-16 18:24:19.000000000 +0100 ++++ tzdata2011d/africa 2011-03-30 17:02:26.000000000 +0200 +@@ -735,6 +735,9 @@ Rule Morocco 2009 only - Jun 1 0:00 1: + Rule Morocco 2009 only - Aug 21 0:00 0 - + Rule Morocco 2010 only - May 2 0:00 1:00 S + Rule Morocco 2010 only - Aug 8 0:00 0 - ++Rule Morocco 2011 only - Apr 3 0:00 1:00 S ++Rule Morocco 2011 only - Aug 1 0:00 0 - ++ + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 + 0:00 Morocco WE%sT 1984 Mar 16 + +Diff finished. Wed Mar 30 17:02:32 2011 diff --git a/tzdata.spec b/tzdata.spec index b0a8e7b..f2ce2f0 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2011d %define tzdata_version 2011d %define tzcode_version 2011d -Release: 2%{?dist} +Release: 3%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -19,6 +19,7 @@ Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz # __decl_patches Patch1: tzdata-2011d-chile.patch Patch2: tzdata-2011d-kemerovo.patch +Patch3: tzdata-2011d-morocco.patch # __end BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +55,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ # __apply_patches %patch1 -p0 %patch2 -p0 +%patch3 -p0 # __end mkdir javazic @@ -115,6 +117,9 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Wed Mar 30 2011 Petr Machata - 2011d-3 +- Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch) + * Tue Mar 29 2011 Petr Machata - 2011d-2 - Delay end of DST in Chile in 2011 until May 7. (tzdata-2011d-chile.patch)