pfrankli pushed to tzdata (f21). "Resolves: #1211427 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 17 03:14:22 UTC 2015
>From fd3c73ee0a0a225a5cf4298dbc4f422588fe5233 Mon Sep 17 00:00:00 2001
From: Patsy Franklin <pfrankli at redhat.com>
Date: Thu, 16 Apr 2015 23:08:25 -0400
Subject: 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
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<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() {
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<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);
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 <pfrankli at redhat.com> - 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 <pfrankli at redhat.com> - 2015b-1
- Rebase to 2015b
- Mongolia will start observing DST again this year, from the last
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/tzdata.git/commit/?h=f21&id=fd3c73ee0a0a225a5cf4298dbc4f422588fe5233
More information about the scm-commits
mailing list