diff --git a/tzdata-2012b-morocco.patch b/tzdata-2012b-morocco.patch new file mode 100644 index 0000000..8fac927 --- /dev/null +++ b/tzdata-2012b-morocco.patch @@ -0,0 +1,59 @@ +*** 8.33/africa 2012-03-10 09:02:05.351276500 -0500 +--- 8.34/africa 2012-03-10 09:02:13.342294400 -0500 +*************** +*** 1,5 **** + #
+! # @(#)africa 8.33 + # This file is in the public domain, so clarified as of + # 2009-05-17 by Arthur David Olson. + +--- 1,5 ---- + #+! # @(#)africa 8.34 + # This file is in the public domain, so clarified as of + # 2009-05-17 by Arthur David Olson. + +*************** +*** 768,773 **** +--- 768,796 ---- + # wall clock time (i.e. 11pm UTC), but that's what I would assume. It has + # also been like that in the past. + ++ # From Alexander Krivenyshev (2012-03-09): ++ # According to Infomédiaire web site from Morocco (infomediaire.ma), ++ # on March 9, 2012, (in French) Heure légale: ++ # Le Maroc adopte officiellement l'heure d'été ++ # ++ # http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9 ++ # ++ # Governing Council adopted draft decree, that Morocco DST starts on ++ # the last Sunday of March (March 25, 2012) and ends on ++ # last Sunday of September (September 30, 2012) ++ # except the month of Ramadan. ++ # or (brief) ++ # ++ # http://www.worldtimezone.com/dst_news/dst_news_morocco06.html ++ # ++ ++ # From Arthur David Olson (2012-03-10): ++ # The infomediaire.ma source indicates that the system is to be in ++ # effect every year. It gives 03H00 as the "fall back" time of day; ++ # it lacks a "spring forward" time of day; assume 2:00 XXX. ++ # Wait on specifying the Ramadan exception for details about ++ # start date, start time of day, end date, and end time of day XXX. ++ + # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S + + Rule Morocco 1939 only - Sep 12 0:00 1:00 S +*************** +*** 793,798 **** +--- 816,824 ---- + Rule Morocco 2010 only - Aug 8 0:00 0 - + Rule Morocco 2011 only - Apr 3 0:00 1:00 S + Rule Morocco 2011 only - Jul 31 0 0 - ++ Rule Morocco 2012 max - Mar lastSun 2:00 1:00 S ++ Rule Morocco 2012 max - Sep lastSun 3: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 --git a/tzdata.spec b/tzdata.spec index fe013a0..1b351ac 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2012b %define tzdata_version 2012b %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-2012b-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 -p1 # __end popd @@ -116,6 +118,12 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Thu Mar 15 2012 Petr Machata- 2012b-2 +- Morocco DST starts on the last Sunday of March (March 25, 2012) and + ends on last Sunday of September, except the month of Ramadan. It + is currently unclear what that Ramadan bit means, so this is not + covered by the patch as of now. + * Tue Mar 6 2012 Petr Machata - 2012b-1 - Rebase to 2012b; changes vs. 2011n-5: - Changes to zones for Antarctica stations