Resolves: #1231313
- Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00, not 06-13 and 07-18 as we had guessed.
This commit is contained in:
Patsy Franklin
parent
1e837f73e6
commit
f70e75208f
32
0001-Morocco-Ramadan-suspension-commentary-update.patch
Normal file
32
0001-Morocco-Ramadan-suspension-commentary-update.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
diff --git a/africa b/africa
|
||||||
|
index 560f0f2..a0b8657 100644
|
||||||
|
--- a/africa
|
||||||
|
+++ b/africa
|
||||||
|
@@ -788,17 +788,13 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
|
||||||
|
# will resume again at 02:00 on Saturday, August 2, 2014....
|
||||||
|
# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
|
||||||
|
|
||||||
|
-# From Milamber (2015-06-08):
|
||||||
|
-# (Google Translation) The current time of Morocco (GMT + 1) will be suspended
|
||||||
|
-# from next Sunday until July 19, announced Monday the Ministry of Civil
|
||||||
|
-# Service and Modernisation of Administration. The hour will thus be delayed
|
||||||
|
-# 60 minutes Sunday, June 14 at 3:00, the ministry said in a statement, adding
|
||||||
|
-# that the time will be advanced again 60 minutes Sunday, July 19, 2015 at
|
||||||
|
-# 2:00. The move comes under 2.12.126 Decree of 26 Jumada I 1433 (18 April
|
||||||
|
-# 2012) and the decision of the Head of Government of 16 N. 3-29-15 Chaaban
|
||||||
|
-# 1435 (4 June 2015).
|
||||||
|
-# Source (french):
|
||||||
|
-# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
|
||||||
|
+# From Milamber (2015-06-09):
|
||||||
|
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863
|
||||||
|
+# (Google Translation): The Ministry of Civil Service and
|
||||||
|
+# Modernisation of Administration announced the return to the legal
|
||||||
|
+# time of the Kingdom (GMT). So the time will be delayed for 60
|
||||||
|
+# minutes from 3:00 am Sunday, June 14, 2015. She will be advanced by
|
||||||
|
+# 60 minutes (GMT + 1) from 3:00 am Sunday, July 19, 2015.
|
||||||
|
|
||||||
|
# From Paul Eggert (2015-06-08):
|
||||||
|
# For now, guess that later spring and fall transitions will use 2015's rules,
|
||||||
|
--
|
||||||
|
2.1.0
|
||||||
|
|
||||||
102
0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch
Normal file
102
0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
diff --git a/africa b/africa
|
||||||
|
index fd9c089..560f0f2 100644
|
||||||
|
--- a/africa
|
||||||
|
+++ b/africa
|
||||||
|
@@ -788,20 +788,33 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
|
||||||
|
# will resume again at 02:00 on Saturday, August 2, 2014....
|
||||||
|
# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
|
||||||
|
|
||||||
|
-# From Paul Eggert (2014-06-05):
|
||||||
|
-# For now, guess that later spring and fall transitions will use 2014's rules,
|
||||||
|
+# From Milamber (2015-06-08):
|
||||||
|
+# (Google Translation) The current time of Morocco (GMT + 1) will be suspended
|
||||||
|
+# from next Sunday until July 19, announced Monday the Ministry of Civil
|
||||||
|
+# Service and Modernisation of Administration. The hour will thus be delayed
|
||||||
|
+# 60 minutes Sunday, June 14 at 3:00, the ministry said in a statement, adding
|
||||||
|
+# that the time will be advanced again 60 minutes Sunday, July 19, 2015 at
|
||||||
|
+# 2:00. The move comes under 2.12.126 Decree of 26 Jumada I 1433 (18 April
|
||||||
|
+# 2012) and the decision of the Head of Government of 16 N. 3-29-15 Chaaban
|
||||||
|
+# 1435 (4 June 2015).
|
||||||
|
+# Source (french):
|
||||||
|
+# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
|
||||||
|
+
|
||||||
|
+# From Paul Eggert (2015-06-08):
|
||||||
|
+# For now, guess that later spring and fall transitions will use 2015's rules,
|
||||||
|
# and guess that Morocco will switch to standard time at 03:00 the last
|
||||||
|
-# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after
|
||||||
|
+# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after
|
||||||
|
# Ramadan. To implement this, transition dates for 2015 through 2037 were
|
||||||
|
# determined by running the following program under GNU Emacs 24.3, with the
|
||||||
|
# results integrated by hand into the table below.
|
||||||
|
-# (let ((islamic-year 1436))
|
||||||
|
+# (let ((islamic-year 1437))
|
||||||
|
+# (require 'cal-islam)
|
||||||
|
# (while (< islamic-year 1460)
|
||||||
|
# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
|
||||||
|
# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
|
||||||
|
-# (saturday 6))
|
||||||
|
-# (while (/= saturday (mod (setq a (1- a)) 7)))
|
||||||
|
-# (while (/= saturday (mod b 7))
|
||||||
|
+# (sunday 0))
|
||||||
|
+# (while (/= sunday (mod (setq a (1- a)) 7)))
|
||||||
|
+# (while (/= sunday (mod b 7))
|
||||||
|
# (setq b (1+ b)))
|
||||||
|
# (setq a (calendar-gregorian-from-absolute a))
|
||||||
|
# (setq b (calendar-gregorian-from-absolute b))
|
||||||
|
@@ -845,32 +858,30 @@ Rule Morocco 2012 only - Aug 20 2:00 1:00 S
|
||||||
|
Rule Morocco 2013 only - Jul 7 3:00 0 -
|
||||||
|
Rule Morocco 2013 only - Aug 10 2:00 1:00 S
|
||||||
|
Rule Morocco 2013 max - Oct lastSun 3:00 0 -
|
||||||
|
-Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S
|
||||||
|
+Rule Morocco 2014 2021 - Mar lastSun 2:00 1:00 S
|
||||||
|
Rule Morocco 2014 only - Jun 28 3:00 0 -
|
||||||
|
Rule Morocco 2014 only - Aug 2 2:00 1:00 S
|
||||||
|
-Rule Morocco 2015 only - Jun 13 3:00 0 -
|
||||||
|
-Rule Morocco 2015 only - Jul 18 2:00 1:00 S
|
||||||
|
-Rule Morocco 2016 only - Jun 4 3:00 0 -
|
||||||
|
-Rule Morocco 2016 only - Jul 9 2:00 1:00 S
|
||||||
|
-Rule Morocco 2017 only - May 20 3:00 0 -
|
||||||
|
-Rule Morocco 2017 only - Jul 1 2:00 1:00 S
|
||||||
|
-Rule Morocco 2018 only - May 12 3:00 0 -
|
||||||
|
-Rule Morocco 2018 only - Jun 16 2:00 1:00 S
|
||||||
|
-Rule Morocco 2019 only - May 4 3:00 0 -
|
||||||
|
-Rule Morocco 2019 only - Jun 8 2:00 1:00 S
|
||||||
|
-Rule Morocco 2020 only - Apr 18 3:00 0 -
|
||||||
|
-Rule Morocco 2020 only - May 30 2:00 1:00 S
|
||||||
|
-Rule Morocco 2021 only - Apr 10 3:00 0 -
|
||||||
|
-Rule Morocco 2021 only - May 15 2:00 1:00 S
|
||||||
|
-Rule Morocco 2022 only - Apr 2 3:00 0 -
|
||||||
|
-Rule Morocco 2022 only - May 7 2:00 1:00 S
|
||||||
|
-Rule Morocco 2023 only - Apr 22 2:00 1:00 S
|
||||||
|
-Rule Morocco 2024 only - Apr 13 2:00 1:00 S
|
||||||
|
-Rule Morocco 2025 only - Apr 5 2:00 1:00 S
|
||||||
|
+Rule Morocco 2015 only - Jun 14 3:00 0 -
|
||||||
|
+Rule Morocco 2015 only - Jul 19 2:00 1:00 S
|
||||||
|
+Rule Morocco 2016 only - Jun 5 3:00 0 -
|
||||||
|
+Rule Morocco 2016 only - Jul 10 2:00 1:00 S
|
||||||
|
+Rule Morocco 2017 only - May 21 3:00 0 -
|
||||||
|
+Rule Morocco 2017 only - Jul 2 2:00 1:00 S
|
||||||
|
+Rule Morocco 2018 only - May 13 3:00 0 -
|
||||||
|
+Rule Morocco 2018 only - Jun 17 2:00 1:00 S
|
||||||
|
+Rule Morocco 2019 only - May 5 3:00 0 -
|
||||||
|
+Rule Morocco 2019 only - Jun 9 2:00 1:00 S
|
||||||
|
+Rule Morocco 2020 only - Apr 19 3:00 0 -
|
||||||
|
+Rule Morocco 2020 only - May 24 2:00 1:00 S
|
||||||
|
+Rule Morocco 2021 only - Apr 11 3:00 0 -
|
||||||
|
+Rule Morocco 2021 only - May 16 2:00 1:00 S
|
||||||
|
+Rule Morocco 2022 only - May 8 2:00 1:00 S
|
||||||
|
+Rule Morocco 2023 only - Apr 23 2:00 1:00 S
|
||||||
|
+Rule Morocco 2024 only - Apr 14 2:00 1:00 S
|
||||||
|
+Rule Morocco 2025 only - Apr 6 2:00 1:00 S
|
||||||
|
Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
|
||||||
|
-Rule Morocco 2035 only - Oct 27 3:00 0 -
|
||||||
|
-Rule Morocco 2036 only - Oct 18 3:00 0 -
|
||||||
|
-Rule Morocco 2037 only - Oct 10 3:00 0 -
|
||||||
|
+Rule Morocco 2036 only - Oct 19 3:00 0 -
|
||||||
|
+Rule Morocco 2037 only - Oct 4 3:00 0 -
|
||||||
|
|
||||||
|
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
|
||||||
|
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
|
||||||
|
--
|
||||||
|
2.1.0
|
||||||
|
|
||||||
12
tzdata.spec
12
tzdata.spec
@ -3,14 +3,15 @@ Name: tzdata
|
|||||||
Version: 2015d
|
Version: 2015d
|
||||||
%define tzdata_version 2015d
|
%define tzdata_version 2015d
|
||||||
%define tzcode_version 2015d
|
%define tzcode_version 2015d
|
||||||
Release: 1%{?dist}
|
Release: 3%{?dist}
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
URL: https://www.iana.org/time-zones
|
URL: https://www.iana.org/time-zones
|
||||||
Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
|
Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
|
||||||
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
|
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
|
||||||
# Add new patches here...
|
# Add new patches here...
|
||||||
# Patch1: your-new-patch.patch
|
Patch0: 0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch
|
||||||
|
Patch1: 0001-Morocco-Ramadan-suspension-commentary-update.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: gawk, glibc, perl
|
BuildRequires: gawk, glibc, perl
|
||||||
@ -41,7 +42,8 @@ This package contains timezone information for use by Java runtimes.
|
|||||||
%setup -q -c -a 1
|
%setup -q -c -a 1
|
||||||
|
|
||||||
# Add new patches here...
|
# Add new patches here...
|
||||||
# %patch1 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
mkdir javazic
|
mkdir javazic
|
||||||
tar zxf %{SOURCE3} -C javazic
|
tar zxf %{SOURCE3} -C javazic
|
||||||
@ -123,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/javazi-1.8
|
%{_datadir}/javazi-1.8
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 12 2015 Patsy Franklin <pfrankli@redhat.com> - 2015d-3
|
||||||
|
- Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
|
||||||
|
not 06-13 and 07-18 as we had guessed.
|
||||||
|
|
||||||
* Mon Apr 27 2015 Patsy Franklin <pfrankli@redhat.com> - 2015d-1
|
* Mon Apr 27 2015 Patsy Franklin <pfrankli@redhat.com> - 2015d-1
|
||||||
- Rebase to 2015d
|
- Rebase to 2015d
|
||||||
- Egypt will not observe DST in 2015 and will consider canceling it
|
- Egypt will not observe DST in 2015 and will consider canceling it
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user