From 230b1321ecd9ab1f1cdd5edafb7eb1f5ec5eef53 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Thu, 14 Aug 2014 14:31:40 -0400 Subject: [PATCH 01/15] Resolves: #1127671 - Rebase to 2014f - Russian time zone changes effective October 26, 2014 - Several other changes as documented in the NEWS file. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 14 ++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8424997..bff7366 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,5 @@ noarch/ /javazic-1.8-37392f2f5d59.tar.xz /tzcode2014e.tar.gz /tzdata2014e.tar.gz +/tzcode2014f.tar.gz +/tzdata2014f.tar.gz diff --git a/sources b/sources index d964b3a..bb407ae 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -552251600ee3571c244d33c7196ec2ed tzcode2014e.tar.gz -8a49fdedd4e832da8e85f7f9bcaedc33 tzdata2014e.tar.gz +1e15be52900cd49e93f093d4731fec96 tzcode2014f.tar.gz +f333b2e8f876221a97871cae0c188aa5 tzdata2014f.tar.gz diff --git a/tzdata.spec b/tzdata.spec index b60a153..43ab8e5 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2014e -%define tzdata_version 2014e -%define tzcode_version 2014e -Release: 4%{?dist} +Version: 2014f +%define tzdata_version 2014f +%define tzcode_version 2014f +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: https://www.iana.org/time-zones @@ -117,6 +117,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Thu Aug 14 2014 Patsy Franklin - 2014f-1 +- Rebase to 2014f + - Russian time zone changes effective 2014-10-26 + - Several other time zone abbreviation changes as described in + the NEWS file. + * Wed Jun 18 2014 Patsy Franklin - 2014e-4 - Update changelog version to match release version. From df06868aa3641c9018b1f719fe9f00c31c6ca0b7 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Thu, 11 Sep 2014 10:56:29 -0400 Subject: [PATCH 02/15] Resolves: #1136301 Rebase to 2014g - Turks & Caicos is switching from US eastern time to UTC-4 year-round, modeled as a switch from EST/EDT to AST on 2014-11-02 at 02:00. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 11 ++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bff7366..2c63ca3 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,5 @@ noarch/ /tzdata2014e.tar.gz /tzcode2014f.tar.gz /tzdata2014f.tar.gz +/tzdata2014g.tar.gz +/tzcode2014g.tar.gz diff --git a/sources b/sources index bb407ae..4788e78 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -1e15be52900cd49e93f093d4731fec96 tzcode2014f.tar.gz -f333b2e8f876221a97871cae0c188aa5 tzdata2014f.tar.gz +f9f59425e55b21d2e52bb3a95fc17b8d tzdata2014g.tar.gz +f154679d48b724fe191efc19b55abd24 tzcode2014g.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 43ab8e5..a657971 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2014f -%define tzdata_version 2014f -%define tzcode_version 2014f +Version: 2014g +%define tzdata_version 2014g +%define tzcode_version 2014g Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -117,6 +117,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Wed Sep 10 2014 Patsy Franklin - 2014g-1 +- Rebase to 2014g + - Turks & Caicos is switching from US eastern time to UTC-4 year-round, + modeled as a switch from EST/EDT to AST on 2014-11-02 at 02:00. + * Thu Aug 14 2014 Patsy Franklin - 2014f-1 - Rebase to 2014f - Russian time zone changes effective 2014-10-26 From 7f47ace580519eb033cf63e7b9f3ad65f0d70f7b Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Mon, 6 Oct 2014 22:37:46 -0400 Subject: [PATCH 03/15] Rebase to tzdata-2014h: - Changes in past time stamps, code, and documentation. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 10 +++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2c63ca3..81caa78 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,5 @@ noarch/ /tzdata2014f.tar.gz /tzdata2014g.tar.gz /tzcode2014g.tar.gz +/tzcode2014h.tar.gz +/tzdata2014h.tar.gz diff --git a/sources b/sources index 4788e78..4719232 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -f9f59425e55b21d2e52bb3a95fc17b8d tzdata2014g.tar.gz -f154679d48b724fe191efc19b55abd24 tzcode2014g.tar.gz +8e7741fc769ebdd94d95e5f2c3adbb60 tzcode2014h.tar.gz +ed05111948beba8a0f30956baa46b272 tzdata2014h.tar.gz diff --git a/tzdata.spec b/tzdata.spec index a657971..d4eb983 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2014g -%define tzdata_version 2014g -%define tzcode_version 2014g +Version: 2014h +%define tzdata_version 2014h +%define tzcode_version 2014h Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -117,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Mon Oct 06 2014 Patsy Franklin - 2014h-1 +- Rebase to 2014h + - Changes in past time stamps, code, and documentation. + * Wed Sep 10 2014 Patsy Franklin - 2014g-1 - Rebase to 2014g - Turks & Caicos is switching from US eastern time to UTC-4 year-round, From 11f738e83c0857f2a7427d8ffe76bbcd83ce4148 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Mon, 27 Oct 2014 18:59:40 -0400 Subject: [PATCH 04/15] Rebase to 2014i - Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00. - A new Zone Pacific/Bougainville, for the part of Papua New Guinea that plans to switch from UTC+10 to UTC+11 on 2014-12-28 at 02:00 --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 81caa78..bd5a648 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,5 @@ noarch/ /tzcode2014g.tar.gz /tzcode2014h.tar.gz /tzdata2014h.tar.gz +/tzdata2014i.tar.gz +/tzcode2014i.tar.gz diff --git a/sources b/sources index 4719232..19f4a10 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -8e7741fc769ebdd94d95e5f2c3adbb60 tzcode2014h.tar.gz -ed05111948beba8a0f30956baa46b272 tzdata2014h.tar.gz +00adeb62a0897aac5ba67da838351adb tzdata2014i.tar.gz +7fa413158f01a961348aa6a289b6be21 tzcode2014i.tar.gz diff --git a/tzdata.spec b/tzdata.spec index d4eb983..b80fa92 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2014h -%define tzdata_version 2014h -%define tzcode_version 2014h +Version: 2014i +%define tzdata_version 2014i +%define tzcode_version 2014i Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -117,6 +117,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Mon Oct 27 2014 Patsy Franklin - 2014i-1 +- Rebase to 2014i + - Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00. + - A new Zone Pacific/Bougainville, for the part of Papua New Guinea + that plans to switch from UTC+10 to UTC+11 on 2014-12-28 at 02:00 + * Mon Oct 06 2014 Patsy Franklin - 2014h-1 - Rebase to 2014h - Changes in past time stamps, code, and documentation. From 43fe4727950b8853aa123b12f7fcced0c7b7d4d2 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Thu, 20 Nov 2014 14:57:10 -0500 Subject: [PATCH 05/15] Resolves: #1163352 - Rebase to 2014j - Turks & Caicos' switch from US eastern time to UTC-4 year-round did not occur on 2014-11-02 at 02:00. It's currently scheduled for 2015-11-01 at 02:00. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bd5a648..09eac24 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,5 @@ noarch/ /tzdata2014h.tar.gz /tzdata2014i.tar.gz /tzcode2014i.tar.gz +/tzcode2014j.tar.gz +/tzdata2014j.tar.gz diff --git a/sources b/sources index 19f4a10..cb42899 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -00adeb62a0897aac5ba67da838351adb tzdata2014i.tar.gz -7fa413158f01a961348aa6a289b6be21 tzcode2014i.tar.gz +970119e9765bc5a9320368851c91ecb6 tzcode2014j.tar.gz +2d7ea9c309f0d4e162e426e568290ca3 tzdata2014j.tar.gz diff --git a/tzdata.spec b/tzdata.spec index b80fa92..7a98687 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2014i -%define tzdata_version 2014i -%define tzcode_version 2014i +Version: 2014j +%define tzdata_version 2014j +%define tzcode_version 2014j Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -117,6 +117,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Wed Nov 19 2014 Patsy Franklin - 2014j-1 +- Rebase to 2014j + - Turks & Caicos' switch from US eastern time to UTC-4 year-round + did not occur on 2014-11-02 at 02:00. It's currently scheduled + for 2015-11-01 at 02:00. + * Mon Oct 27 2014 Patsy Franklin - 2014i-1 - Rebase to 2014i - Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00. From 2a337061dc24ff8ca96088783606d89489487be9 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Fri, 13 Feb 2015 12:02:58 -0500 Subject: [PATCH 06/15] Rebase to 2015a - New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49. - The Mexican state of Quintana Roo, represented by America/Cancun, will shift from Central Time with DST to Eastern Time without DST on 2015-02-01 at 02:00. - Chile will not change clocks in April or thereafter; its new standard time will be its old daylight saving time. This affects America/Santiago, Pacific/Easter, and Antarctica/Palmer. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 09eac24..55e4dfd 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,5 @@ noarch/ /tzcode2014i.tar.gz /tzcode2014j.tar.gz /tzdata2014j.tar.gz +/tzcode2015a.tar.gz +/tzdata2015a.tar.gz diff --git a/sources b/sources index cb42899..ea4a2a7 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -970119e9765bc5a9320368851c91ecb6 tzcode2014j.tar.gz -2d7ea9c309f0d4e162e426e568290ca3 tzdata2014j.tar.gz +8f375ede46ae137fbac047ac431bda37 tzcode2015a.tar.gz +4ed11c894a74a5ea64201b1c6dbb8831 tzdata2015a.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 7a98687..2df7ade 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2014j -%define tzdata_version 2014j -%define tzcode_version 2014j +Version: 2015a +%define tzdata_version 2015a +%define tzcode_version 2015a Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -117,6 +117,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Thu Feb 12 2015 Patsy Franklin - 2015a-1 +- Rebase to 2015a + - New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49. + - The Mexican state of Quintana Roo, represented by America/Cancun, + will shift from Central Time with DST to Eastern Time without DST + on 2015-02-01 at 02:00. + - Chile will not change clocks in April or thereafter; its new standard time + will be its old daylight saving time. This affects America/Santiago, + Pacific/Easter, and Antarctica/Palmer. + * Wed Nov 19 2014 Patsy Franklin - 2014j-1 - Rebase to 2014j - Turks & Caicos' switch from US eastern time to UTC-4 year-round From aa029b8c1b5197038b67105ac37d96abf8889677 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Fri, 13 Feb 2015 12:05:00 -0500 Subject: [PATCH 07/15] Rebase to 2015a - New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49. - The Mexican state of Quintana Roo, represented by America/Cancun, will shift from Central Time with DST to Eastern Time without DST on 2015-02-01 at 02:00. - Chile will not change clocks in April or thereafter; its new standard time will be its old daylight saving time. This affects America/Santiago, Pacific/Easter, and Antarctica/Palmer. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index dbf8912..c19f592 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,5 @@ noarch/ /tzdata2014i.tar.gz /tzcode2014j.tar.gz /tzdata2014j.tar.gz +/tzcode2015a.tar.gz +/tzdata2015a.tar.gz diff --git a/sources b/sources index cb42899..ea4a2a7 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -970119e9765bc5a9320368851c91ecb6 tzcode2014j.tar.gz -2d7ea9c309f0d4e162e426e568290ca3 tzdata2014j.tar.gz +8f375ede46ae137fbac047ac431bda37 tzcode2015a.tar.gz +4ed11c894a74a5ea64201b1c6dbb8831 tzdata2015a.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 7a98687..2df7ade 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2014j -%define tzdata_version 2014j -%define tzcode_version 2014j +Version: 2015a +%define tzdata_version 2015a +%define tzcode_version 2015a Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -117,6 +117,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Thu Feb 12 2015 Patsy Franklin - 2015a-1 +- Rebase to 2015a + - New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49. + - The Mexican state of Quintana Roo, represented by America/Cancun, + will shift from Central Time with DST to Eastern Time without DST + on 2015-02-01 at 02:00. + - Chile will not change clocks in April or thereafter; its new standard time + will be its old daylight saving time. This affects America/Santiago, + Pacific/Easter, and Antarctica/Palmer. + * Wed Nov 19 2014 Patsy Franklin - 2014j-1 - Rebase to 2014j - Turks & Caicos' switch from US eastern time to UTC-4 year-round From 09c88e36aabea654e1980d7c086c4414e516499e Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Wed, 25 Mar 2015 21:53:24 -0400 Subject: [PATCH 08/15] Rebase to 2015b - Mongolia will start observing DST again this year, from the last Saturday in March at 02:00 to the last Saturday in September at 00:00. - Palestine will start DST on March 28, not March 27. Also, correct the fall 2014 transition from September 26 to October 24. Adjust future predictions accordingly. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 14 +++++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c19f592..1b16fcd 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,5 @@ noarch/ /tzdata2014j.tar.gz /tzcode2015a.tar.gz /tzdata2015a.tar.gz +/tzdata2015b.tar.gz +/tzcode2015b.tar.gz diff --git a/sources b/sources index ea4a2a7..e5aa851 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -8f375ede46ae137fbac047ac431bda37 tzcode2015a.tar.gz -4ed11c894a74a5ea64201b1c6dbb8831 tzdata2015a.tar.gz +75571bb17c7b6be88a9f8872e45bc726 tzdata2015b.tar.gz +f073a7c9bca7f9fe408491f826e92968 tzcode2015b.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 2df7ade..9de5a0e 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2015a -%define tzdata_version 2015a -%define tzcode_version 2015a +Version: 2015b +%define tzdata_version 2015b +%define tzcode_version 2015b Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -117,6 +117,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Wed Mar 25 2015 Patsy Franklin - 2015b-1 +- Rebase to 2015b + - Mongolia will start observing DST again this year, from the last + Saturday in March at 02:00 to the last Saturday in September at 00:00. + - Palestine will start DST on March 28, not March 27. Also, + correct the fall 2014 transition from September 26 to October 24. + Adjust future predictions accordingly. + * Thu Feb 12 2015 Patsy Franklin - 2015a-1 - Rebase to 2015a - New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49. From f251fac1d27515f3820ea40668562015aa2a8be5 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Wed, 25 Mar 2015 21:54:19 -0400 Subject: [PATCH 09/15] Rebase to 2015b - Mongolia will start observing DST again this year, from the last Saturday in March at 02:00 to the last Saturday in September at 00:00. - Palestine will start DST on March 28, not March 27. Also, correct the fall 2014 transition from September 26 to October 24. Adjust future predictions accordingly. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 14 +++++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 55e4dfd..3523b86 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,5 @@ noarch/ /tzdata2014j.tar.gz /tzcode2015a.tar.gz /tzdata2015a.tar.gz +/tzcode2015b.tar.gz +/tzdata2015b.tar.gz diff --git a/sources b/sources index ea4a2a7..aecff55 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -8f375ede46ae137fbac047ac431bda37 tzcode2015a.tar.gz -4ed11c894a74a5ea64201b1c6dbb8831 tzdata2015a.tar.gz +f073a7c9bca7f9fe408491f826e92968 tzcode2015b.tar.gz +75571bb17c7b6be88a9f8872e45bc726 tzdata2015b.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 2df7ade..9de5a0e 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2015a -%define tzdata_version 2015a -%define tzcode_version 2015a +Version: 2015b +%define tzdata_version 2015b +%define tzcode_version 2015b Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -117,6 +117,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Wed Mar 25 2015 Patsy Franklin - 2015b-1 +- Rebase to 2015b + - Mongolia will start observing DST again this year, from the last + Saturday in March at 02:00 to the last Saturday in September at 00:00. + - Palestine will start DST on March 28, not March 27. Also, + correct the fall 2014 transition from September 26 to October 24. + Adjust future predictions accordingly. + * Thu Feb 12 2015 Patsy Franklin - 2015a-1 - Rebase to 2015a - New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49. From d3735449b86a239c5edf11009fb01e619ca75d1b Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Thu, 16 Apr 2015 23:07:29 -0400 Subject: [PATCH 10/15] Resolves: #1211427 - Rebase to tzdata-2015c - Egypt's spring-forward transition is at 24:00 on April's last Thursday, not 00:00 on April's last Friday. 2015's transition will therefore be o Thursday, April 30 at 24:00, not Friday, April 24 at 00:00. Similar fix apply to 2026, 2037, 2043, etc. - Rebase javazic tool to match latest upstream OpenJDK version --- .gitignore | 2 ++ 7090844.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++ 7133138.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++ rebase-01.patch | 37 +++++++++++++++++++++++++++++++++++++ rebase-02.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ sources | 4 ++-- tzdata.spec | 22 ++++++++++++++++++---- 7 files changed, 189 insertions(+), 6 deletions(-) create mode 100644 7090844.patch create mode 100644 7133138.patch create mode 100644 rebase-01.patch create mode 100644 rebase-02.patch diff --git a/.gitignore b/.gitignore index 1b16fcd..e523ef9 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,5 @@ noarch/ /tzdata2015a.tar.gz /tzdata2015b.tar.gz /tzcode2015b.tar.gz +/tzdata2015c.tar.gz +/tzcode2015c.tar.gz diff --git a/7090844.patch b/7090844.patch new file mode 100644 index 0000000..669d171 --- /dev/null +++ b/7090844.patch @@ -0,0 +1,44 @@ +diff --git a/7090844.patch b/7090844.patch +new file mode 100644 +index 0000000..fd5b531 +--- /dev/null ++++ b/7090844.patch +@@ -0,0 +1,38 @@ ++--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:42:30.000000000 -0400 +++++ sun/tools/javazic/Mappings.java 2015-04-13 12:43:32.000000000 -0400 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -26,9 +26,6 @@ ++ package sun.tools.javazic; ++ ++ import java.util.ArrayList; ++-import java.util.HashMap; ++-import java.util.HashSet; ++-import java.util.Iterator; ++ import java.util.LinkedList; ++ import java.util.List; ++ import java.util.Map; ++@@ -79,8 +76,8 @@ ++ // If the GMT offset of this Zone will change in some ++ // future time, this Zone is added to the exclude list. ++ boolean isExcluded = false; ++- if (zone.size() > 1) { ++- ZoneRec zrec = zone.get(zone.size()-2); +++ for (int i = 0; i < zone.size(); i++) { +++ ZoneRec zrec = zone.get(i); ++ if ((zrec.getGmtOffset() != rawOffset) ++ && (zrec.getUntilTime(0) > Time.getCurrentTime())) { ++ if (excludeList == null) { ++@@ -88,6 +85,7 @@ ++ } ++ excludeList.add(zone.getName()); ++ isExcluded = true; +++ break; ++ } ++ } ++ diff --git a/7133138.patch b/7133138.patch new file mode 100644 index 0000000..ef71275 --- /dev/null +++ b/7133138.patch @@ -0,0 +1,44 @@ +diff --git a/7133138.patch b/7133138.patch +new file mode 100644 +index 0000000..882f15f +--- /dev/null ++++ b/7133138.patch +@@ -0,0 +1,38 @@ ++--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:44:10.000000000 -0400 +++++ sun/tools/javazic/Mappings.java 2015-04-13 12:45:28.000000000 -0400 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -26,6 +26,7 @@ ++ package sun.tools.javazic; ++ ++ import java.util.ArrayList; +++import java.util.HashMap; ++ import java.util.LinkedList; ++ import java.util.List; ++ import java.util.Map; ++@@ -162,6 +163,20 @@ ++ for (String key : toBeRemoved) { ++ aliases.remove(key); ++ } +++ // Eliminate any alias-to-alias mappings. For example, if +++ // there are A->B and B->C, A->B is changed to A->C. +++ Map newMap = new HashMap(); +++ for (String key : aliases.keySet()) { +++ String realid = aliases.get(key); +++ String leaf = realid; +++ while (aliases.get(leaf) != null) { +++ leaf = aliases.get(leaf); +++ } +++ if (!realid.equals(leaf)) { +++ newMap.put(key, leaf); +++ } +++ } +++ aliases.putAll(newMap); ++ } ++ ++ Map getAliases() { diff --git a/rebase-01.patch b/rebase-01.patch new file mode 100644 index 0000000..3613014 --- /dev/null +++ b/rebase-01.patch @@ -0,0 +1,37 @@ +diff --git a/rebase-01.patch b/rebase-01.patch +new file mode 100644 +index 0000000..bca6ed4 +--- /dev/null ++++ b/rebase-01.patch +@@ -0,0 +1,31 @@ ++--- sun/tools/javazic/Mappings.java.orig 2007-08-30 03:55:48.000000000 -0400 +++++ sun/tools/javazic/Mappings.java 2015-04-13 12:39:44.000000000 -0400 ++@@ -1,12 +1,12 @@ ++ /* ++- * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. +++ * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++- * published by the Free Software Foundation. Sun designates this +++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++- * by Sun in the LICENSE file that accompanied this code. +++ * by Oracle in the LICENSE file that accompanied this code. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++@@ -18,9 +18,9 @@ ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++- * CA 95054 USA or visit www.sun.com if you need additional information or ++- * have any questions. +++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +++ * or visit www.oracle.com if you need additional information or have any +++ * questions. ++ */ ++ ++ package sun.tools.javazic; diff --git a/rebase-02.patch b/rebase-02.patch new file mode 100644 index 0000000..1f17044 --- /dev/null +++ b/rebase-02.patch @@ -0,0 +1,42 @@ +diff --git a/rebase-02.patch b/rebase-02.patch +new file mode 100644 +index 0000000..0f57125 +--- /dev/null ++++ b/rebase-02.patch +@@ -0,0 +1,36 @@ ++--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:40:26.000000000 -0400 +++++ sun/tools/javazic/Mappings.java 2015-04-13 12:42:11.000000000 -0400 ++@@ -75,8 +75,10 @@ ++ Zone zone = zones.get(zoneName); ++ String zonename = zone.getName(); ++ int rawOffset = zone.get(zone.size()-1).getGmtOffset(); +++ ++ // If the GMT offset of this Zone will change in some ++ // future time, this Zone is added to the exclude list. +++ boolean isExcluded = false; ++ if (zone.size() > 1) { ++ ZoneRec zrec = zone.get(zone.size()-2); ++ if ((zrec.getGmtOffset() != rawOffset) ++@@ -85,7 +87,7 @@ ++ excludeList = new ArrayList(); ++ } ++ excludeList.add(zone.getName()); ++- continue; +++ isExcluded = true; ++ } ++ } ++ ++@@ -101,9 +103,11 @@ ++ rawOffsetsIndex.add(i, rawOffset); ++ ++ Set perRawOffset = new TreeSet(); ++- perRawOffset.add(zonename); +++ if (!isExcluded) { +++ perRawOffset.add(zonename); +++ } ++ rawOffsetsIndexTable.add(i, perRawOffset); ++- } else { +++ } else if (!isExcluded) { ++ int i = rawOffsetsIndex.indexOf(new Integer(rawOffset)); ++ Set perRawOffset = rawOffsetsIndexTable.get(i); ++ perRawOffset.add(zonename); diff --git a/sources b/sources index e5aa851..78afded 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -75571bb17c7b6be88a9f8872e45bc726 tzdata2015b.tar.gz -f073a7c9bca7f9fe408491f826e92968 tzcode2015b.tar.gz +4b4a3e344786198c46909e5afde08788 tzdata2015c.tar.gz +182c85e99be2bcc6b77d9956c8c0dcce tzcode2015c.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 9de5a0e..6c9438d 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2015b -%define tzdata_version 2015b -%define tzcode_version 2015b +Version: 2015c +%define tzdata_version 2015c +%define tzcode_version 2015c Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -29,7 +29,10 @@ Group: System Environment/Base Source3: javazic.tar.gz Source4: javazic-1.8-37392f2f5d59.tar.xz Patch100: javazic-fixup.patch -Patch101: javazic-exclusion-fix.patch +Patch101: rebase-01.patch +Patch102: rebase-02.patch +Patch103: 7090844.patch +Patch104: 7133138.patch %description java This package contains timezone information for use by Java runtimes. @@ -45,6 +48,9 @@ tar zxf %{SOURCE3} -C javazic pushd javazic %patch100 %patch101 +%patch102 +%patch103 +%patch104 # Hack alert! sun.tools may be defined and installed in the # VM. In order to guarantee that we are using IcedTea/OpenJDK @@ -117,6 +123,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Thu Apr 16 2015 Patsy Franklin - 2015c-1 +- Rebase to 2015c + - Egypt's spring-forward transition is at 24:00 on April's last Thursday, + not 00:00 on April's last Friday. 2015's transition will therefore be on + Thursday, April 30 at 24:00, not Friday, April 24 at 00:00. Similar fixes + apply to 2026, 2037, 2043, etc. (Thanks to Steffen Thorsen.) +- Rebase javazic tool to match latest upstream OpenJDK version + * Wed Mar 25 2015 Patsy Franklin - 2015b-1 - Rebase to 2015b - Mongolia will start observing DST again this year, from the last From fd3c73ee0a0a225a5cf4298dbc4f422588fe5233 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Thu, 16 Apr 2015 23:08:25 -0400 Subject: [PATCH 11/15] Resolves: #1211427 - Rebase to tzdata-2015c - Egypt's spring-forward transition is at 24:00 on April's last Thursday, not 00:00 on April's last Friday. 2015's transition will therefore be o Thursday, April 30 at 24:00, not Friday, April 24 at 00:00. Similar fix apply to 2026, 2037, 2043, etc. - Rebase javazic tool to match latest upstream OpenJDK version --- .gitignore | 2 ++ 7090844.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++ 7133138.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++ rebase-01.patch | 37 +++++++++++++++++++++++++++++++++++++ rebase-02.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ sources | 4 ++-- tzdata.spec | 22 ++++++++++++++++++---- 7 files changed, 189 insertions(+), 6 deletions(-) create mode 100644 7090844.patch create mode 100644 7133138.patch create mode 100644 rebase-01.patch create mode 100644 rebase-02.patch diff --git a/.gitignore b/.gitignore index 3523b86..5e2a7bd 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,5 @@ noarch/ /tzdata2015a.tar.gz /tzcode2015b.tar.gz /tzdata2015b.tar.gz +/tzdata2015c.tar.gz +/tzcode2015c.tar.gz diff --git a/7090844.patch b/7090844.patch new file mode 100644 index 0000000..669d171 --- /dev/null +++ b/7090844.patch @@ -0,0 +1,44 @@ +diff --git a/7090844.patch b/7090844.patch +new file mode 100644 +index 0000000..fd5b531 +--- /dev/null ++++ b/7090844.patch +@@ -0,0 +1,38 @@ ++--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:42:30.000000000 -0400 +++++ sun/tools/javazic/Mappings.java 2015-04-13 12:43:32.000000000 -0400 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -26,9 +26,6 @@ ++ package sun.tools.javazic; ++ ++ import java.util.ArrayList; ++-import java.util.HashMap; ++-import java.util.HashSet; ++-import java.util.Iterator; ++ import java.util.LinkedList; ++ import java.util.List; ++ import java.util.Map; ++@@ -79,8 +76,8 @@ ++ // If the GMT offset of this Zone will change in some ++ // future time, this Zone is added to the exclude list. ++ boolean isExcluded = false; ++- if (zone.size() > 1) { ++- ZoneRec zrec = zone.get(zone.size()-2); +++ for (int i = 0; i < zone.size(); i++) { +++ ZoneRec zrec = zone.get(i); ++ if ((zrec.getGmtOffset() != rawOffset) ++ && (zrec.getUntilTime(0) > Time.getCurrentTime())) { ++ if (excludeList == null) { ++@@ -88,6 +85,7 @@ ++ } ++ excludeList.add(zone.getName()); ++ isExcluded = true; +++ break; ++ } ++ } ++ diff --git a/7133138.patch b/7133138.patch new file mode 100644 index 0000000..ef71275 --- /dev/null +++ b/7133138.patch @@ -0,0 +1,44 @@ +diff --git a/7133138.patch b/7133138.patch +new file mode 100644 +index 0000000..882f15f +--- /dev/null ++++ b/7133138.patch +@@ -0,0 +1,38 @@ ++--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:44:10.000000000 -0400 +++++ sun/tools/javazic/Mappings.java 2015-04-13 12:45:28.000000000 -0400 ++@@ -1,5 +1,5 @@ ++ /* ++- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++@@ -26,6 +26,7 @@ ++ package sun.tools.javazic; ++ ++ import java.util.ArrayList; +++import java.util.HashMap; ++ import java.util.LinkedList; ++ import java.util.List; ++ import java.util.Map; ++@@ -162,6 +163,20 @@ ++ for (String key : toBeRemoved) { ++ aliases.remove(key); ++ } +++ // Eliminate any alias-to-alias mappings. For example, if +++ // there are A->B and B->C, A->B is changed to A->C. +++ Map newMap = new HashMap(); +++ for (String key : aliases.keySet()) { +++ String realid = aliases.get(key); +++ String leaf = realid; +++ while (aliases.get(leaf) != null) { +++ leaf = aliases.get(leaf); +++ } +++ if (!realid.equals(leaf)) { +++ newMap.put(key, leaf); +++ } +++ } +++ aliases.putAll(newMap); ++ } ++ ++ Map getAliases() { diff --git a/rebase-01.patch b/rebase-01.patch new file mode 100644 index 0000000..3613014 --- /dev/null +++ b/rebase-01.patch @@ -0,0 +1,37 @@ +diff --git a/rebase-01.patch b/rebase-01.patch +new file mode 100644 +index 0000000..bca6ed4 +--- /dev/null ++++ b/rebase-01.patch +@@ -0,0 +1,31 @@ ++--- sun/tools/javazic/Mappings.java.orig 2007-08-30 03:55:48.000000000 -0400 +++++ sun/tools/javazic/Mappings.java 2015-04-13 12:39:44.000000000 -0400 ++@@ -1,12 +1,12 @@ ++ /* ++- * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. +++ * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++- * published by the Free Software Foundation. Sun designates this +++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++- * by Sun in the LICENSE file that accompanied this code. +++ * by Oracle in the LICENSE file that accompanied this code. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++@@ -18,9 +18,9 @@ ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++- * CA 95054 USA or visit www.sun.com if you need additional information or ++- * have any questions. +++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +++ * or visit www.oracle.com if you need additional information or have any +++ * questions. ++ */ ++ ++ package sun.tools.javazic; diff --git a/rebase-02.patch b/rebase-02.patch new file mode 100644 index 0000000..1f17044 --- /dev/null +++ b/rebase-02.patch @@ -0,0 +1,42 @@ +diff --git a/rebase-02.patch b/rebase-02.patch +new file mode 100644 +index 0000000..0f57125 +--- /dev/null ++++ b/rebase-02.patch +@@ -0,0 +1,36 @@ ++--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:40:26.000000000 -0400 +++++ sun/tools/javazic/Mappings.java 2015-04-13 12:42:11.000000000 -0400 ++@@ -75,8 +75,10 @@ ++ Zone zone = zones.get(zoneName); ++ String zonename = zone.getName(); ++ int rawOffset = zone.get(zone.size()-1).getGmtOffset(); +++ ++ // If the GMT offset of this Zone will change in some ++ // future time, this Zone is added to the exclude list. +++ boolean isExcluded = false; ++ if (zone.size() > 1) { ++ ZoneRec zrec = zone.get(zone.size()-2); ++ if ((zrec.getGmtOffset() != rawOffset) ++@@ -85,7 +87,7 @@ ++ excludeList = new ArrayList(); ++ } ++ excludeList.add(zone.getName()); ++- continue; +++ isExcluded = true; ++ } ++ } ++ ++@@ -101,9 +103,11 @@ ++ rawOffsetsIndex.add(i, rawOffset); ++ ++ Set perRawOffset = new TreeSet(); ++- perRawOffset.add(zonename); +++ if (!isExcluded) { +++ perRawOffset.add(zonename); +++ } ++ rawOffsetsIndexTable.add(i, perRawOffset); ++- } else { +++ } else if (!isExcluded) { ++ int i = rawOffsetsIndex.indexOf(new Integer(rawOffset)); ++ Set perRawOffset = rawOffsetsIndexTable.get(i); ++ perRawOffset.add(zonename); diff --git a/sources b/sources index aecff55..78afded 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -f073a7c9bca7f9fe408491f826e92968 tzcode2015b.tar.gz -75571bb17c7b6be88a9f8872e45bc726 tzdata2015b.tar.gz +4b4a3e344786198c46909e5afde08788 tzdata2015c.tar.gz +182c85e99be2bcc6b77d9956c8c0dcce tzcode2015c.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 9de5a0e..6c9438d 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2015b -%define tzdata_version 2015b -%define tzcode_version 2015b +Version: 2015c +%define tzdata_version 2015c +%define tzcode_version 2015c Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -29,7 +29,10 @@ Group: System Environment/Base Source3: javazic.tar.gz Source4: javazic-1.8-37392f2f5d59.tar.xz Patch100: javazic-fixup.patch -Patch101: javazic-exclusion-fix.patch +Patch101: rebase-01.patch +Patch102: rebase-02.patch +Patch103: 7090844.patch +Patch104: 7133138.patch %description java This package contains timezone information for use by Java runtimes. @@ -45,6 +48,9 @@ tar zxf %{SOURCE3} -C javazic pushd javazic %patch100 %patch101 +%patch102 +%patch103 +%patch104 # Hack alert! sun.tools may be defined and installed in the # VM. In order to guarantee that we are using IcedTea/OpenJDK @@ -117,6 +123,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Thu Apr 16 2015 Patsy Franklin - 2015c-1 +- Rebase to 2015c + - Egypt's spring-forward transition is at 24:00 on April's last Thursday, + not 00:00 on April's last Friday. 2015's transition will therefore be on + Thursday, April 30 at 24:00, not Friday, April 24 at 00:00. Similar fixes + apply to 2026, 2037, 2043, etc. (Thanks to Steffen Thorsen.) +- Rebase javazic tool to match latest upstream OpenJDK version + * Wed Mar 25 2015 Patsy Franklin - 2015b-1 - Rebase to 2015b - Mongolia will start observing DST again this year, from the last From 1e837f73e6fdea805dfc633c7cd3cd75bff1c676 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Mon, 27 Apr 2015 22:56:08 -0400 Subject: [PATCH 12/15] Resolves: #1215298 - Rebase to 2015d - Egypt will not observe DST in 2015 and will consider canceling it permanently. For now, assume no DST indefinitely. - The abbreviations for Hawaii-Aleutian standard and daylight times have been changed from HAST/HADT to HST/HDT, as per US Government Printing Office style. This affects only America/Adak since 1983, as America/Honolulu was already using the new style. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 15 ++++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e523ef9..e5ddf75 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,5 @@ noarch/ /tzcode2015b.tar.gz /tzdata2015c.tar.gz /tzcode2015c.tar.gz +/tzcode2015d.tar.gz +/tzdata2015d.tar.gz diff --git a/sources b/sources index 78afded..d70f5e6 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -4b4a3e344786198c46909e5afde08788 tzdata2015c.tar.gz -182c85e99be2bcc6b77d9956c8c0dcce tzcode2015c.tar.gz +4008a3abc025a398697b2587c48258b9 tzcode2015d.tar.gz +b595bdc4474b8fc1a15cffc67c66025b tzdata2015d.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 6c9438d..da39991 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2015c -%define tzdata_version 2015c -%define tzcode_version 2015c +Version: 2015d +%define tzdata_version 2015d +%define tzcode_version 2015d Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -123,6 +123,15 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Mon Apr 27 2015 Patsy Franklin - 2015d-1 +- Rebase to 2015d + - Egypt will not observe DST in 2015 and will consider canceling it + permanently. For now, assume no DST indefinitely. + - The abbreviations for Hawaii-Aleutian standard and daylight times + have been changed from HAST/HADT to HST/HDT, as per US Government + Printing Office style. This affects only America/Adak since 1983, + as America/Honolulu was already using the new style. + * Thu Apr 16 2015 Patsy Franklin - 2015c-1 - Rebase to 2015c - Egypt's spring-forward transition is at 24:00 on April's last Thursday, From 5f3f2bd56a7c0bd2b2900b8087471c075fce1953 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Mon, 27 Apr 2015 22:56:35 -0400 Subject: [PATCH 13/15] Resolves: #1215298 - Rebase to 2015d - Egypt will not observe DST in 2015 and will consider canceling it permanently. For now, assume no DST indefinitely. - The abbreviations for Hawaii-Aleutian standard and daylight times have been changed from HAST/HADT to HST/HDT, as per US Government Printing Office style. This affects only America/Adak since 1983, as America/Honolulu was already using the new style. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 15 ++++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5e2a7bd..2dddff9 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,5 @@ noarch/ /tzdata2015b.tar.gz /tzdata2015c.tar.gz /tzcode2015c.tar.gz +/tzcode2015d.tar.gz +/tzdata2015d.tar.gz diff --git a/sources b/sources index 78afded..d70f5e6 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -4b4a3e344786198c46909e5afde08788 tzdata2015c.tar.gz -182c85e99be2bcc6b77d9956c8c0dcce tzcode2015c.tar.gz +4008a3abc025a398697b2587c48258b9 tzcode2015d.tar.gz +b595bdc4474b8fc1a15cffc67c66025b tzdata2015d.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 6c9438d..da39991 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2015c -%define tzdata_version 2015c -%define tzcode_version 2015c +Version: 2015d +%define tzdata_version 2015d +%define tzcode_version 2015d Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -123,6 +123,15 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Mon Apr 27 2015 Patsy Franklin - 2015d-1 +- Rebase to 2015d + - Egypt will not observe DST in 2015 and will consider canceling it + permanently. For now, assume no DST indefinitely. + - The abbreviations for Hawaii-Aleutian standard and daylight times + have been changed from HAST/HADT to HST/HDT, as per US Government + Printing Office style. This affects only America/Adak since 1983, + as America/Honolulu was already using the new style. + * Thu Apr 16 2015 Patsy Franklin - 2015c-1 - Rebase to 2015c - Egypt's spring-forward transition is at 24:00 on April's last Thursday, From f70e75208f0c2196632ac694fe5ca9feab7195d0 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Fri, 12 Jun 2015 12:28:16 -0400 Subject: [PATCH 14/15] 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. --- ...Ramadan-suspension-commentary-update.patch | 32 ++++++ ...adan-suspension-now-Sunday-to-Sunday.patch | 102 ++++++++++++++++++ tzdata.spec | 12 ++- 3 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 0001-Morocco-Ramadan-suspension-commentary-update.patch create mode 100644 0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch diff --git a/0001-Morocco-Ramadan-suspension-commentary-update.patch b/0001-Morocco-Ramadan-suspension-commentary-update.patch new file mode 100644 index 0000000..eaaa4c9 --- /dev/null +++ b/0001-Morocco-Ramadan-suspension-commentary-update.patch @@ -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 + diff --git a/0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch b/0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch new file mode 100644 index 0000000..b66f20c --- /dev/null +++ b/0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch @@ -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 + diff --git a/tzdata.spec b/tzdata.spec index da39991..1954286 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,14 +3,15 @@ Name: tzdata Version: 2015d %define tzdata_version 2015d %define tzcode_version 2015d -Release: 1%{?dist} +Release: 3%{?dist} License: Public Domain Group: System Environment/Base URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz # 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) BuildRequires: gawk, glibc, perl @@ -41,7 +42,8 @@ This package contains timezone information for use by Java runtimes. %setup -q -c -a 1 # Add new patches here... -# %patch1 -p1 +%patch0 -p1 +%patch1 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -123,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Fri Jun 12 2015 Patsy Franklin - 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 - 2015d-1 - Rebase to 2015d - Egypt will not observe DST in 2015 and will consider canceling it From 3872ad6823b107d663f20e324b14acfe2227b93d Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Fri, 12 Jun 2015 12:30:28 -0400 Subject: [PATCH 15/15] 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. --- ...Ramadan-suspension-commentary-update.patch | 32 ++++++ ...adan-suspension-now-Sunday-to-Sunday.patch | 102 ++++++++++++++++++ tzdata.spec | 12 ++- 3 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 0001-Morocco-Ramadan-suspension-commentary-update.patch create mode 100644 0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch diff --git a/0001-Morocco-Ramadan-suspension-commentary-update.patch b/0001-Morocco-Ramadan-suspension-commentary-update.patch new file mode 100644 index 0000000..eaaa4c9 --- /dev/null +++ b/0001-Morocco-Ramadan-suspension-commentary-update.patch @@ -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 + diff --git a/0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch b/0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch new file mode 100644 index 0000000..b66f20c --- /dev/null +++ b/0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch @@ -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 + diff --git a/tzdata.spec b/tzdata.spec index da39991..1954286 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,14 +3,15 @@ Name: tzdata Version: 2015d %define tzdata_version 2015d %define tzcode_version 2015d -Release: 1%{?dist} +Release: 3%{?dist} License: Public Domain Group: System Environment/Base URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz # 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) BuildRequires: gawk, glibc, perl @@ -41,7 +42,8 @@ This package contains timezone information for use by Java runtimes. %setup -q -c -a 1 # Add new patches here... -# %patch1 -p1 +%patch0 -p1 +%patch1 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -123,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Fri Jun 12 2015 Patsy Franklin - 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 - 2015d-1 - Rebase to 2015d - Egypt will not observe DST in 2015 and will consider canceling it