packages/tzdata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!1 remove Israel and El_Aaiun timezone and sync community patches

Browse Source 
Merge pull request !1 from SuperSix/master
This commit is contained in:
openeuler-ci-bot 2020-01-02 19:26:12 +08:00 committed by Gitee
commit dac8a8ac29
10 changed files with 397 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
7090844.patch
View File

@ -1,44 +0,0 @@
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;
+ }
+ }
+

44
7133138.patch
View File

@ -1,44 +0,0 @@
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<String, String> newMap = new HashMap<String, String>();
++ 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<String,String> getAliases() {

75
backport-Fiji-observes-DST-from-2019-11-10-to-2020-01-12.patch Normal file
View File

@ -0,0 +1,75 @@
From 03bf34820f37a089e2e17fc0444661429fb12843 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 6 Aug 2019 09:41:18 -0700
Subject: [PATCH 21/46] Fiji observes DST from 2019-11-10 to 2020-01-12
* NEWS: Mention this.
* australasia (Fiji): Guess future transitions Nov Sun>=8
and Jan Sun>=12 instead of Nov Sun>=1 and Jan Sun>=13.
---
NEWS | 11 +++++++++++
australasia | 20 ++++++++++++--------
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/NEWS b/NEWS
index 3414383..3b5cc22 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,15 @@
News for the tz database
+
+Unreleased, experimental changes
+
+ Briefly:
+ Fiji observes DST from 2019-11-10 to 2020-01-12.
+
+ Changes to future timestamps
+
+ Fiji's next DST transitions will be 2019-11-10 and 2020-01-12
+ instead of 2019-11-03 and 2020-01-19. (Thanks to Raymond Kumar.)
+ Adjust future guesses accordingly.
Release 2019b - 2019-07-01 00:09:53 -0700
diff --git a/australasia b/australasia
index 0544e58..5e53db1 100644
--- a/australasia
+++ b/australasia
@@ -367,13 +367,16 @@ Zone Indian/Cocos 6:27:40 - LMT 1900
# From Raymond Kumar (2018-07-13):
# http://www.fijitimes.com/government-approves-2018-daylight-saving/
# ... The daylight saving period will end at 3am on Sunday January 13, 2019.
-#
-# From Paul Eggert (2018-07-15):
-# For now, guess DST from 02:00 the first Sunday in November to 03:00
-# the first Sunday on or after January 13. January transitions reportedly
+
+# From Paul Eggert (2019-08-06):
+# Today Raymond Kumar reported the Government of Fiji Gazette Supplement No. 27
+# (2019-08-02) said that Fiji observes DST "commencing at 2.00 am on
+# Sunday, 10 November 2019 and ending at 3.00 am on Sunday, 12 January 2020."
+# For now, guess DST from 02:00 the second Sunday in November to 03:00
+# the first Sunday on or after January 12. January transitions reportedly
# depend on when school terms start. Although the guess is ad hoc, it matches
-# transitions since late 2014 and seems more likely to match future
-# practice than guessing no DST.
+# transitions planned this year and seems more likely to match future practice
+# than guessing no DST.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
@@ -384,8 +387,9 @@ Rule Fiji 2010 2013 - Oct Sun>=21 2:00 1:00 -
Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 -
Rule Fiji 2014 only - Jan Sun>=18 2:00 0 -
-Rule Fiji 2014 max - Nov Sun>=1 2:00 1:00 -
-Rule Fiji 2015 max - Jan Sun>=13 3:00 0 -
+Rule Fiji 2014 2018 - Nov Sun>=1 2:00 1:00 -
+Rule Fiji 2015 max - Jan Sun>=12 3:00 0 -
+Rule Fiji 2019 max - Nov Sun>=8 2:00 1:00 -
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji +12/+13
--
2.19.1

67
backport-Norfolk-Island-starts-observing-Australian-style-DST.patch Normal file
View File

@ -0,0 +1,67 @@
From 1050999f9fef7e187051a12438efac2a3bb18507 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 14 Aug 2019 10:38:28 -0700
Subject: [PATCH 22/46] Norfolk Island starts observing Australian-style DST
(Thanks to Kyle Czech and Michael Deckers.)
* NEWS: Mention this.
* australasia (Pacific/Norfolk):
Start observing AN-style DST this spring.
---
NEWS | 5 +++++
australasia | 9 ++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 3b5cc22..6cdb873 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Unreleased, experimental changes
Briefly:
Fiji observes DST from 2019-11-10 to 2020-01-12.
+ Norfolk Island starts observing Australian-style DST.
Changes to future timestamps
@@ -11,6 +12,10 @@ Unreleased, experimental changes
instead of 2019-11-03 and 2020-01-19. (Thanks to Raymond Kumar.)
Adjust future guesses accordingly.
+ Norfolk Island will observe Australian-style DST starting in
+ spring 2019. The first transition is on 2019-10-06. (Thanks to
+ Kyle Czech and Michael Deckers.)
+
Release 2019b - 2019-07-01 00:09:53 -0700
Briefly:
diff --git a/australasia b/australasia
index 5e53db1..33f9732 100644
--- a/australasia
+++ b/australasia
@@ -611,7 +611,8 @@ Zone Pacific/Norfolk 11:11:52 - LMT 1901 # Kingston
11:30 - +1130 1974 Oct 27 02:00
11:30 1:00 +1230 1975 Mar 2 02:00
11:30 - +1130 2015 Oct 4 02:00
- 11:00 - +11
+ 11:00 - +11 2019 Jul
+ 11:00 AN +11/+12
# Palau (Belau)
# Zone NAME STDOFF RULES FORMAT [UNTIL]
@@ -1886,6 +1887,12 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# other than in 1974/5. See:
# https://www.timeanddate.com/time/australia/norfolk-island.html
+# Norfolk started observing Australian DST in spring 2019.
+# From Kyle Czech (2019-08-13):
+# https://www.legislation.gov.au/Details/F2018L01702
+# From Michael Deckers (2019-08-14):
+# https://www.legislation.gov.au/Details/F2019C00010
+
# Palau
# See commentary for Micronesia.
--
2.19.1

99
backport-Rename-America-Godthab-to-America-Nuuk.patch Normal file
View File

@ -0,0 +1,99 @@
From d7715ab774d8ffdf6b745a8758f392617890c676 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 19 Nov 2019 15:16:16 -0800
Subject: [PATCH 1/2] Rename America/Godthab to America/Nuuk
* NEWS: Mention this.
* backward (America/Godthab): New backward-compatibility link.
* europe, zone.tab, zone1970.tab (America/Nuuk):
Rename from America/Godthab.
---
NEWS | 6 ++++++
backward | 1 +
europe | 7 +++++--
zone.tab | 2 +-
zone1970.tab | 2 +-
5 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index af0f06f..c28905b 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,12 @@ Unreleased, experimental changes
spring 2019. The first transition is on 2019-10-06. (Thanks to
Kyle Czech and Michael Deckers.)
+ Changes to timezone identifiers
+
+ To reflect current usage in English better, America/Godthab has
+ been renamed to America/Nuuk. A backwards-compatibility link
+ remains for the old name.
+
Release 2019b - 2019-07-01 00:09:53 -0700
Briefly:
diff --git a/backward b/backward
index b4ae3cf..e13ae52 100644
--- a/backward
+++ b/backward
@@ -17,6 +17,7 @@ Link America/Atikokan America/Coral_Harbour
Link America/Argentina/Cordoba America/Cordoba
Link America/Tijuana America/Ensenada
Link America/Indiana/Indianapolis America/Fort_Wayne
+Link America/Nuuk America/Godthab
Link America/Indiana/Indianapolis America/Indianapolis
Link America/Argentina/Jujuy America/Jujuy
Link America/Indiana/Knox America/Knox_IN
diff --git a/europe b/europe
index 361b396..ea6b103 100644
--- a/europe
+++ b/europe
@@ -1175,14 +1175,17 @@ Zone America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28
-3:00 - -03 1980 Apr 6 2:00
-3:00 EU -03/-02 1996
0:00 - GMT
+#
+# Use the old name Scoresbysund, as the current name Ittoqqortoormiit
+# exceeds tzdb's 14-letter limit and has no common English abbreviation.
Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit
-2:00 - -02 1980 Apr 6 2:00
-2:00 C-Eur -02/-01 1981 Mar 29
-1:00 EU -01/+00
-Zone America/Godthab -3:26:56 - LMT 1916 Jul 28 # Nuuk
+Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb
-3:00 - -03 1980 Apr 6 2:00
-3:00 EU -03/-02
-Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik air base
+Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik
-4:00 Thule A%sT
# Estonia
diff --git a/zone.tab b/zone.tab
index 408fcb2..55c8ca9 100644
--- a/zone.tab
+++ b/zone.tab
@@ -189,7 +189,7 @@ GF +0456-05220 America/Cayenne
GG +492717-0023210 Europe/Guernsey
GH +0533-00013 Africa/Accra
GI +3608-00521 Europe/Gibraltar
-GL +6411-05144 America/Godthab Greenland (most areas)
+GL +6411-05144 America/Nuuk Greenland (most areas)
GL +7646-01840 America/Danmarkshavn National Park (east coast)
GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit
GL +7634-06847 America/Thule Thule/Pituffik
diff --git a/zone1970.tab b/zone1970.tab
index 822ffa1..f761f3e 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -173,7 +173,7 @@ GE +4143+04449 Asia/Tbilisi
GF +0456-05220 America/Cayenne
GH +0533-00013 Africa/Accra
GI +3608-00521 Europe/Gibraltar
-GL +6411-05144 America/Godthab Greenland (most areas)
+GL +6411-05144 America/Nuuk Greenland (most areas)
GL +7646-01840 America/Danmarkshavn National Park (east coast)
GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit
GL +7634-06847 America/Thule Thule/Pituffik
--
1.8.3.1

37
rebase-01.patch
View File

@ -1,37 +0,0 @@
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;

42
rebase-02.patch
View File

@ -1,42 +0,0 @@
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<String>();
+ }
+ excludeList.add(zone.getName());
+- continue;
++ isExcluded = true;
+ }
+ }
+
+@@ -101,9 +103,11 @@
+ rawOffsetsIndex.add(i, rawOffset);
+
+ Set<String> perRawOffset = new TreeSet<String>();
+- perRawOffset.add(zonename);
++ if (!isExcluded) {
++ perRawOffset.add(zonename);
++ }
+ rawOffsetsIndexTable.add(i, perRawOffset);
+- } else {
++ } else if (!isExcluded) {
+ int i = rawOffsetsIndex.indexOf(new Integer(rawOffset));
+ Set<String> perRawOffset = rawOffsetsIndexTable.get(i);
+ perRawOffset.add(zonename);

94
remove-El_Aaiun-timezone.patch.patch Normal file
View File

@ -0,0 +1,94 @@
From 2c270f246664c9990c6e06b13a579db5df34a1f7 Mon Sep 17 00:00:00 2001
From: liuchao <liuchao173@huawei.com>
Date: Thu, 26 Dec 2019 08:00:47 +0000
Subject: [PATCH] tzdata: remove El_Aaiun timezone
Remove El_Aaiun timezone for political sensitivity
---
NEWS | 9 +++------
africa | 16 ----------------
zone.tab | 1 -
zone1970.tab | 1 -
4 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/NEWS b/NEWS
index 0f386df..abbd71a 100644
--- a/NEWS
+++ b/NEWS
@@ -1257,9 +1257,9 @@ Release 2016g - 2016-09-13 08:56:38 -0700
zic no longer generates binary files containing POSIX TZ-like
strings that disagree with the local time type after the last
explicit transition in the data. This fixes a bug with
- Africa/Casablanca and Africa/El_Aaiun in some year-2037 timestamps
- on the reference platform. (Thanks to Alexander Belopolsky for
- reporting the bug and suggesting a way forward.)
+ Africa/Casablanca in some year-2037 timestamps on the reference
+ platform. (Thanks to Alexander Belopolsky for reporting the bug
+ and suggesting a way forward.)
If the installed localtime and/or posixrules files are symbolic
links, zic now keeps them symbolic links when updating them, for
@@ -2614,9 +2614,6 @@ Release 2013h - 2013-10-25 15:32:32 -0700
Libya has switched its UT offset back to +02 without DST, instead
of +01 with DST. (Thanks to Even Scharning.)
- Western Sahara (Africa/El_Aaiun) uses Morocco's DST rules.
- (Thanks to Gwillim Law.)
-
Changes affecting future timestamps:
Acre and (we guess) western Amazonas will switch from UT -04 to -05
diff --git a/africa b/africa
index feb6017..64f385a 100644
--- a/africa
+++ b/africa
@@ -1090,22 +1090,6 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco +00/+01 2018 Oct 28 3:00
1:00 Morocco +01/+00
-# Western Sahara
-#
-# From Gwillim Law (2013-10-22):
-# A correspondent who is usually well informed about time zone matters
-# ... says that Western Sahara observes daylight saving time, just as
-# Morocco does.
-#
-# From Paul Eggert (2013-10-23):
-# Assume that this has been true since Western Sahara switched to GMT,
-# since most of it was then controlled by Morocco.
-
-Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
- -1:00 - -01 1976 Apr 14
- 0:00 Morocco +00/+01 2018 Oct 28 3:00
- 1:00 Morocco +01/+00
-
# Mozambique
#
# Shanks gives 1903-03-01 for the transition to CAT.
diff --git a/zone.tab b/zone.tab
index 3164018..e6e09bc 100644
--- a/zone.tab
+++ b/zone.tab
@@ -168,7 +168,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland)
EC -0054-08936 Pacific/Galapagos Galapagos Islands
EE +5925+02445 Europe/Tallinn
EG +3003+03115 Africa/Cairo
-EH +2709-01312 Africa/El_Aaiun
ER +1520+03853 Africa/Asmara
ES +4024-00341 Europe/Madrid Spain (mainland)
ES +3553-00519 Africa/Ceuta Ceuta, Melilla
diff --git a/zone1970.tab b/zone1970.tab
index 03ec66b..6a27a7f 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -156,7 +156,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland)
EC -0054-08936 Pacific/Galapagos Galápagos Islands
EE +5925+02445 Europe/Tallinn
EG +3003+03115 Africa/Cairo
-EH +2709-01312 Africa/El_Aaiun
ES +4024-00341 Europe/Madrid Spain (mainland)
ES +3553-00519 Africa/Ceuta Ceuta, Melilla
ES +2806-01524 Atlantic/Canary Canary Islands
--
2.19.1

25
remove-Israel-timezone.patch.patch Normal file
View File

@ -0,0 +1,25 @@
From 56ce50af655d47852ee35185e89e48d7bf9398f3 Mon Sep 17 00:00:00 2001
From: liuchao <liuchao173@huawei.com>
Date: Fri, 27 Dec 2019 03:26:21 +0000
Subject: [PATCH] tzdata: remove Israel timezone
Remove Israel timezone for political sensitivity
---
backward | 1 -
1 file changed, 1 deletion(-)
diff --git a/backward b/backward
index 7a83706..57e7e87 100644
--- a/backward
+++ b/backward
@@ -88,7 +88,6 @@ Link Etc/GMT Greenwich
Link Asia/Hong_Kong Hongkong
Link Atlantic/Reykjavik Iceland
Link Asia/Tehran Iran
-Link Asia/Jerusalem Israel
Link America/Jamaica Jamaica
Link Asia/Tokyo Japan
Link Pacific/Kwajalein Kwajalein
--
2.19.1

36
tzdata.spec
View File

@ -1,13 +1,23 @@
Name: tzdata Name: tzdata
Version: 2019b Version: 2019b
Release: 6 Release: 7
Summary: Timezone data Summary: Timezone data
License: Public Domain License: Public Domain
URL: https://www.iana.org/time-zones URL: https://www.iana.org/time-zones
Source0: https://data.iana.org/time-zones/releases/tzdata%{version}.tar.gz Source0: https://data.iana.org/time-zones/releases/tzdata%{version}.tar.gz
Source1: https://data.iana.org/time-zones/releases/tzcode%{version}.tar.gz Source1: https://data.iana.org/time-zones/releases/tzcode%{version}.tar.gz
Patch002: 0002-Fix-have-snprintf-error.patch Patch002: 0002-Fix-have-snprintf-error.patch
Patch6000: backport-Fiji-observes-DST-from-2019-11-10-to-2020-01-12.patch
Patch6001: backport-Norfolk-Island-starts-observing-Australian-style-DST.patch
Patch6002: backport-Rename-America-Godthab-to-America-Nuuk.patch
Patch9000: bugfix-0001-add-Beijing-timezone.patch
Patch9001: remove-country-selection-from-tzselect-steps.patch
Patch9002: remove-ROC-timezone.patch
Patch9003: rename-Macau-to-Macao.patch
BuildRequires: gawk glibc perl-interpreter BuildRequires: gawk glibc perl-interpreter
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: glibc-common >= 2.5.90-7 BuildRequires: glibc-common >= 2.5.90-7
@ -22,15 +32,6 @@ Summary: Timezone data for Java
Source3: javazic.tar.gz Source3: javazic.tar.gz
Source4: javazic-1.8-37392f2f5d59.tar.xz Source4: javazic-1.8-37392f2f5d59.tar.xz
Patch100: javazic-fixup.patch Patch100: javazic-fixup.patch
Patch101: rebase-01.patch
Patch102: rebase-02.patch
Patch103: 7090844.patch
Patch104: 7133138.patch
Patch9000: bugfix-0001-add-Beijing-timezone.patch
Patch9001: remove-country-selection-from-tzselect-steps.patch
Patch9002: remove-ROC-timezone.patch
Patch9003: rename-Macau-to-Macao.patch
%description java %description java
This package contains timezone information for use by Java runtimes. This package contains timezone information for use by Java runtimes.
@ -39,6 +40,11 @@ This package contains timezone information for use by Java runtimes.
%setup -q -c -a 1 %setup -q -c -a 1
%patch002 -p1 %patch002 -p1
%patch6000 -p1
%patch6001 -p1
%patch6002 -p1
%patch9000 -p1 %patch9000 -p1
%patch9001 -p1 %patch9001 -p1
%patch9002 -p1 %patch9002 -p1
@ -52,10 +58,6 @@ mkdir javazic
tar zxf %{SOURCE3} -C javazic tar zxf %{SOURCE3} -C javazic
cd javazic cd javazic
%patch100 %patch100
%patch101
%patch102
%patch103
%patch104
mv sun rht mv sun rht
find . -type f -name '*.java' -print0 \ find . -type f -name '*.java' -print0 \
@ -118,6 +120,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
%{_datadir}/javazi-1.8 %{_datadir}/javazi-1.8
%changelog %changelog
* Thu Jan 2 2020 liuchao<liuchao173@huawei.com> - 2019b-7
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:remove Israel and El_Aaiun timezone and sync community patches
* Wed Dec 4 2019 liuchao<liuchao173@huawei.com> - 2019b-6 * Wed Dec 4 2019 liuchao<liuchao173@huawei.com> - 2019b-6
- Type:recommended - Type:recommended
- ID:NA - ID:NA