diff --git a/tzdata-2012c-morocco.patch b/tzdata-2012c-morocco.patch new file mode 100644 index 0000000..42c836e --- /dev/null +++ b/tzdata-2012c-morocco.patch @@ -0,0 +1,15 @@ +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 b691156..95edcd0 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2012c %define tzdata_version 2012c %define tzcode_version 2012b -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://munnari.oz.au/pub/ @@ -17,6 +17,7 @@ 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) @@ -53,6 +54,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ pushd tzdata%{tzdata_version} # __apply_patches +%patch1 # __end popd @@ -116,6 +118,10 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Fri Jul 13 2012 Petr Machata - 2012c-2 +- Morocco will not observe DST during the month of Ramadan + (tzdata-2012c-morocco.patch) + * Mon Apr 2 2012 Petr Machata - 2012c-1 - Upstream 2012c - Haiti observes DST from 2012 on