From a01b55f48f87281fb814e2867c85b62171150fe2 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 26 Jul 2013 20:34:15 +0200 Subject: [PATCH] 2013d --- ...y-to-try-to-defuse-recent-issues-som.patch | 220 ------------------ ...lem-Fix-LMT-to-match-more-precise-lo.patch | 28 --- ...Morocco-s-midsummer-2013-transitions.patch | 53 ----- ...s-back-on-the-last-Sunday-of-October.patch | 63 ----- tzdata.spec | 22 +- 5 files changed, 9 insertions(+), 377 deletions(-) delete mode 100644 0001-Adjust-commentary-to-try-to-defuse-recent-issues-som.patch delete mode 100644 0002-asia-Asia-Jerusalem-Fix-LMT-to-match-more-precise-lo.patch delete mode 100644 0003-Move-Morocco-s-midsummer-2013-transitions.patch delete mode 100644 0004-Israel-now-falls-back-on-the-last-Sunday-of-October.patch diff --git a/0001-Adjust-commentary-to-try-to-defuse-recent-issues-som.patch b/0001-Adjust-commentary-to-try-to-defuse-recent-issues-som.patch deleted file mode 100644 index 0c72e69..0000000 --- a/0001-Adjust-commentary-to-try-to-defuse-recent-issues-som.patch +++ /dev/null @@ -1,220 +0,0 @@ -From d3b025adb25554ee10b986850371e573df92733e Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 27 May 2013 18:08:26 -0700 -Subject: [PATCH] Adjust commentary to try to defuse recent issues somewhat. - -This change stemmed from a long discussion on the tz mailing list -about what country the Jerusalem zone entry is in. The idea of -this change is to deemphasize the role of countries in the tz -database, to lessen the amount of controversy in the future. -Due to backward compatibility concerns this change does not eliminate -the role of countries entirely. With one minor exception this -change does not alter any code or data, just comments. -* Theory, zone.tab: Deemphasize the role of countries in choosing -location names, as they tend to introduce political conflict -during maintenance, and country information isn't needed for -typical uses of the database. -* Theory: Say that names should differ in more than just case, and why; -and explain why 'backward' means old names will continue to work. -(thanks to Norbert Lindenberg for spotting these issues). -Update citation date and URL. -* iso3166.tab: Mention latest maintenance update. -Update citation URL. Add missing comma for BQ. -Be more consistent about abbreviating Sint like Saint. -Mention SX "Dutch part" for consistency with MF "French part". -* iso3166.tab, zone.tab: Add legal/territorial disclaimer. -* zone.tab: Say that country/zone overlaps can occur in both -directions, and that column 2 need not lie within column 1. -(Asia/Jerusalem): Change the coordinates from a sloppy value, -taken from an old astrology book, to a more-precise value, the -site of city hall. The sloppy value sparked some controversy and -the hope is that the more-precise value will be a bit less -controversial. ---- - Theory | 27 ++++++++++++++------------- - iso3166.tab | 21 ++++++++++----------- - zone.tab | 17 ++++++++++++----- - 3 files changed, 36 insertions(+), 29 deletions(-) - -diff --git a/Theory b/Theory -index b00a492..751b12d 100644 ---- a/Theory -+++ b/Theory -@@ -264,12 +264,12 @@ in decreasing order of importance: - TZ strings. A file name component must not exceed 14 - characters or start with `-'. E.g., prefer `Brunei' - to `Bandar_Seri_Begawan'. -- Include at least one location per time zone rule set per country. -- One such location is enough. Use ISO 3166 (see the file -- iso3166.tab) to help decide whether something is a country. -- However, uninhabited ISO 3166 regions like Bouvet Island -+ Do not use names that differ only in case. Although the reference -+ implementation is case-sensitive, some other implementations -+ are not, and they would mishandle names differing only in case. -+ Uninhabited regions like the North Pole and Bouvet Island - do not need locations, since local time is not defined there. -- If all the clocks in a country's region have agreed since 1970, -+ If all the clocks in a region have agreed since 1970, - don't bother to include more than one location - even if subregions' clocks disagreed before 1970. - Otherwise these tables would become annoyingly large. -@@ -283,7 +283,7 @@ in decreasing order of importance: - Use mainstream English spelling, e.g. prefer `Rome' to `Roma', and - prefer `Athens' to the true name (which uses Greek letters). - The POSIX file name restrictions encourage this rule. -- Use the most populous among locations in a country's time zone, -+ Use the most populous among locations in a zone, - e.g. prefer `Shanghai' to `Beijing'. Among locations with - similar populations, pick the best-known location, - e.g. prefer `Rome' to `Milan'. -@@ -302,10 +302,11 @@ in decreasing order of importance: - Milan's population has grown to be somewhat greater - than Rome's. - If a name is changed, put its old spelling in the `backward' file. -+ This means old spellings will continue to work. - - The file `zone.tab' lists the geographical locations used to name - time zone rule files. It is intended to be an exhaustive list --of canonical names for geographic regions. -+of names for geographic regions as described above. - - Older versions of this package used a different naming scheme, - and these older names are still supported. -@@ -359,14 +360,13 @@ in decreasing order of importance: - If this is not available or is a phrase mentioning the country - (e.g. ``Cape Verde Time''), then: - -- When a country has a single or principal time zone region, -+ When a country is identified with a single or principal zone, - append `T' to the country's ISO code, e.g. `CVT' for - Cape Verde Time. For summer time append `ST'; - for double summer time append `DST'; etc. -- When a country has multiple time zones, take the first three -- letters of an English place name identifying each zone -- and then append `T', `ST', etc. as before; -- e.g. `VLAST' for VLAdivostok Summer Time. -+ Otherwise, take the first three letters of an English place -+ name identifying each zone and append 'T', 'ST', etc. -+ as before; e.g. 'VLAST' for VLAdivostok Summer Time. - - Use UTC (with time zone abbreviation "zzz") for locations while - uninhabited. The "zzz" mnemonic is that these locations are, -@@ -587,7 +587,8 @@ Sources: - - Michael Allison and Robert Schmunk, - "Technical Notes on Mars Solar Time as Adopted by the Mars24 Sunclock" -- (2004-07-30). -+ (2012-08-08). - - Jia-Rui Chong, "Workdays Fit for a Martian", Los Angeles Times -+ - (2004-01-14), pp A1, A20-A21. -diff --git a/iso3166.tab b/iso3166.tab -index b952ca1..c184a81 100644 ---- a/iso3166.tab -+++ b/iso3166.tab -@@ -1,16 +1,14 @@ --# 
-+# ISO 3166 alpha-2 country codes
-+#
- # This file is in the public domain, so clarified as of
- # 2009-05-17 by Arthur David Olson.
--# ISO 3166 alpha-2 country codes
- #
--# From Paul Eggert (2006-09-27):
-+# From Paul Eggert (2013-05-27):
- #
- # This file contains a table with the following columns:
- # 1.  ISO 3166-1 alpha-2 country code, current as of
--#     ISO 3166-1 Newsletter VI-1 (2007-09-21).  See:
--#     
--#     ISO 3166 Maintenance agency (ISO 3166/MA)
--#     .
-+#     ISO 3166-1 Newsletter VI-15 (2013-05-10).  See: Updates on ISO 3166
-+#   http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
- # 2.  The usual English name for the country,
- #     chosen so that alphabetic sorting of subsets produces helpful lists.
- #     This is not the same as the English name in the ISO 3166 tables.
-@@ -20,8 +18,9 @@
- #
- # Lines beginning with `#' are comments.
- #
--# From Arthur David Olson (2011-08-17):
--# Resynchronized today with the ISO 3166 site (adding SS for South Sudan).
-+# This table is intended as an aid for users, to help them select time
-+# zone data appropriate for their practical needs.  It is not intended
-+# to take or endorse any position on legal or territorial claims.
- #
- #country-
- #code	country name
-@@ -54,7 +53,7 @@ BL	St Barthelemy
- BM	Bermuda
- BN	Brunei
- BO	Bolivia
--BQ	Bonaire Sint Eustatius & Saba
-+BQ	Bonaire, St Eustatius & Saba
- BR	Brazil
- BS	Bahamas
- BT	Bhutan
-@@ -235,7 +234,7 @@ SR	Suriname
- SS	South Sudan
- ST	Sao Tome & Principe
- SV	El Salvador
--SX	Sint Maarten
-+SX	St Maarten (Dutch part)
- SY	Syria
- SZ	Swaziland
- TC	Turks & Caicos Is
-diff --git a/zone.tab b/zone.tab
-index 6b98520..3ec24a7 100644
---- a/zone.tab
-+++ b/zone.tab
-@@ -1,18 +1,21 @@
--# 
-+# TZ zone descriptions
-+#
- # This file is in the public domain, so clarified as of
- # 2009-05-17 by Arthur David Olson.
- #
--# TZ zone descriptions
--#
--# From Paul Eggert (1996-08-05):
-+# From Paul Eggert (2013-05-27):
- #
- # This file contains a table with the following columns:
- # 1.  ISO 3166 2-character country code.  See the file `iso3166.tab'.
-+#     This identifies a country that overlaps the zone.  The country may
-+#     overlap other zones and the zone may overlap other countries.
- # 2.  Latitude and longitude of the zone's principal location
- #     in ISO 6709 sign-degrees-minutes-seconds format,
- #     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
- #     first latitude (+ is north), then longitude (+ is east).
-+#     This location need not lie within the column-1 country.
- # 3.  Zone name used in value of TZ environment variable.
-+#     Please see the 'Theory' file for how zone names are chosen.
- # 4.  Comments; present if and only if the country has multiple rows.
- #
- # Columns are separated by a single tab.
-@@ -22,6 +25,10 @@
- #
- # Lines beginning with `#' are comments.
- #
-+# This table is intended as an aid for users, to help them select time
-+# zone data appropriate for their practical needs.  It is not intended
-+# to take or endorse any position on legal or territorial claims.
-+#
- #country-
- #code	coordinates	TZ			comments
- AD	+4230+00131	Europe/Andorra
-@@ -216,7 +223,7 @@ ID	-0002+10920	Asia/Pontianak	west & central Borneo
- ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
- ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
- IE	+5320-00615	Europe/Dublin
--IL	+3146+03514	Asia/Jerusalem
-+IL	+314650+0351326	Asia/Jerusalem
- IM	+5409-00428	Europe/Isle_of_Man
- IN	+2232+08822	Asia/Kolkata
- IO	-0720+07225	Indian/Chagos
--- 
-1.7.6.5
-
diff --git a/0002-asia-Asia-Jerusalem-Fix-LMT-to-match-more-precise-lo.patch b/0002-asia-Asia-Jerusalem-Fix-LMT-to-match-more-precise-lo.patch
deleted file mode 100644
index 82d084b..0000000
--- a/0002-asia-Asia-Jerusalem-Fix-LMT-to-match-more-precise-lo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5546a79cea3ca04893c1814c4db1df1e12590273 Mon Sep 17 00:00:00 2001
-From: Paul Eggert 
-Date: Thu, 30 May 2013 08:54:25 -0700
-Subject: [PATCH] * asia (Asia/Jerusalem): Fix LMT to match more-precise
- longitude.
-
-Suggested by Tim Parenti in
-.
----
- asia |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/asia b/asia
-index e544fcc..437e15f 100644
---- a/asia
-+++ b/asia
-@@ -1244,7 +1244,7 @@ Rule	Zion	2028	max	-	Oct	Sun>=2	2:00	0	S
- #Rule	Zion	2082	max	-	Oct	Sun>=2	2:00	0	S
- 
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
--Zone	Asia/Jerusalem	2:20:56 -	LMT	1880
-+Zone	Asia/Jerusalem	2:20:54 -	LMT	1880
- 			2:20:40	-	JMT	1918	# Jerusalem Mean Time?
- 			2:00	Zion	I%sT
- 
--- 
-1.7.6.5
-
diff --git a/0003-Move-Morocco-s-midsummer-2013-transitions.patch b/0003-Move-Morocco-s-midsummer-2013-transitions.patch
deleted file mode 100644
index cb1131e..0000000
--- a/0003-Move-Morocco-s-midsummer-2013-transitions.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 30344f7c14010c60cd9d8f9995ca8c7cbb4bb0e5 Mon Sep 17 00:00:00 2001
-From: Paul Eggert 
-Date: Tue, 2 Jul 2013 23:49:41 -0700
-Subject: [PATCH 1/3] Move Morocco's midsummer 2013 transitions.
-
-* africa (Morocco): This year's midsummer transitions are
-July 7 and August 10, not July 9 and August 8.
-Thanks to Andrew Paprocki in
-.
----
- africa |   16 +++++++++++-----
- 1 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/africa b/africa
-index 5f4f8eb..a92d7f5 100644
---- a/africa
-+++ b/africa
-@@ -852,12 +852,18 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
- # announced that year's Ramadan daylight-saving transitions would be
- # 2012-07-20 and 2012-08-20; see
- # .
--#
-+
-+# From Andrew Paprocki (2013-07-02):
-+# Morocco announced that the year's Ramadan daylight-savings
-+# transitions would be 2013-07-07 and 2013-08-10; see:
-+# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10
-+
-+# From Paul Eggert (2013-07-03):
- # To estimate what the Moroccan government will do in future years,
--# transition dates for 2013 through 2021 were determined by running
-+# transition dates for 2014 through 2021 were determined by running
- # the following program under GNU Emacs 24.3:
- #
--# (let ((islamic-year 1434))
-+# (let ((islamic-year 1435))
- #   (while (< islamic-year 1444)
- #     (let ((a
- #	     (calendar-gregorian-from-absolute
-@@ -910,8 +916,8 @@ Rule	Morocco	2012	2019	-	Apr	 lastSun 2:00	1:00	S
- Rule	Morocco	2012	max	-	Sep	 lastSun 3:00	0	-
- Rule	Morocco	2012	only	-	Jul	 20	 3:00	0	-
- Rule	Morocco	2012	only	-	Aug	 20	 2:00	1:00	S
--Rule	Morocco	2013	only	-	Jul	  9	 3:00	0	-
--Rule	Morocco	2013	only	-	Aug	  8	 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	2014	only	-	Jun	 29	 3:00	0	-
- Rule	Morocco	2014	only	-	Jul	 29	 2:00	1:00	S
- Rule	Morocco	2015	only	-	Jun	 18	 3:00	0	-
--- 
-1.7.6.5
-
diff --git a/0004-Israel-now-falls-back-on-the-last-Sunday-of-October.patch b/0004-Israel-now-falls-back-on-the-last-Sunday-of-October.patch
deleted file mode 100644
index 4a59737..0000000
--- a/0004-Israel-now-falls-back-on-the-last-Sunday-of-October.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From c7438a654395f4754fb5c703f839aafa0fd1fa1d Mon Sep 17 00:00:00 2001
-From: Ephraim Silverberg 
-Date: Wed, 3 Jul 2013 00:57:38 -0700
-Subject: [PATCH 2/3] Israel now falls back on the last Sunday of October.
-
-* asia (Zion): Change fallback rule for 2013 on to Oct lastSun 2:00.
----
- asia |   36 +++++++++---------------------------
- 1 files changed, 9 insertions(+), 27 deletions(-)
-
-diff --git a/asia b/asia
-index fb6fbca..79cfc48 100644
---- a/asia
-+++ b/asia
-@@ -1212,36 +1212,18 @@ Rule	Zion	2011	only	-	Oct	 2	2:00	0	S
- Rule	Zion	2012	only	-	Mar	Fri>=26	2:00	1:00	D
- Rule	Zion	2012	only	-	Sep	23	2:00	0	S
- 
--# From Ephraim Silverberg (2012-10-18):
--# Yesterday, the Interior Ministry Committee, after more than a year
--# past, approved sending the proposed June 2011 changes to the Time
--# Decree Law back to the Knesset for second and third (final) votes
--# before the upcoming elections on Jan. 22, 2013.  Hence, although the
--# changes are not yet law, they are expected to be so before February 2013.
--#
--# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March.
--# DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the
--# second day of the Jewish Rosh Hashana holiday, in which case DST ends a day
--# later (i.e. at 02:00 the first Monday after October 2).
--# [Rosh Hashana holidays are factored in until 2100.]
--
--# From Ephraim Silverberg (2012-11-05):
--# The Knesset passed today (in second and final readings) the amendment to the
--# Time Decree Law making the changes ... law.
-+# From Ephraim Silverberg (2013-06-27):
-+# On June 23, 2013, the Israeli government approved changes to the
-+# Time Decree Law.  The next day, the changes passed the First Reading
-+# in the Knesset.  The law is expected to pass the Second and Third
-+# (final) Readings by the beginning of September 2013.
-+#
-+# As of 2013, DST starts at 02:00 on the Friday before the last Sunday
-+# in March.  DST ends at 02:00 on the last Sunday of October.
- 
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
- Rule	Zion	2013	max	-	Mar	Fri>=23	2:00	1:00	D
--Rule	Zion	2013	2026	-	Oct	Sun>=2	2:00	0	S
--Rule	Zion	2027	only	-	Oct	Mon>=3	2:00	0	S
--Rule	Zion	2028	max	-	Oct	Sun>=2	2:00	0	S
--# The following rules are commented out for now, as they break older
--# versions of zic that support only signed 32-bit timestamps, i.e.,
--# through 2038-01-19 03:14:07 UTC.
--#Rule	Zion	2028	2053	-	Oct	Sun>=2	2:00	0	S
--#Rule	Zion	2054	only	-	Oct	Mon>=3	2:00	0	S
--#Rule	Zion	2055	2080	-	Oct	Sun>=2	2:00	0	S
--#Rule	Zion	2081	only	-	Oct	Mon>=3	2:00	0	S
--#Rule	Zion	2082	max	-	Oct	Sun>=2	2:00	0	S
-+Rule	Zion	2013	max	-	Oct	lastSun	2:00	0	S
- 
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Jerusalem	2:20:54 -	LMT	1880
--- 
-1.7.6.5
-
diff --git a/tzdata.spec b/tzdata.spec
index 18a6a25..2382705 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,18 +1,14 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2013c
-%define tzdata_version 2013c
-%define tzcode_version 2013c
-Release: 2%{?dist}
+Version: 2013d
+%define tzdata_version 2013d
+%define tzcode_version 2013d
+Release: 1%{?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
-Patch2: 0001-Adjust-commentary-to-try-to-defuse-recent-issues-som.patch
-Patch3: 0002-asia-Asia-Jerusalem-Fix-LMT-to-match-more-precise-lo.patch
-Patch4: 0003-Move-Morocco-s-midsummer-2013-transitions.patch
-Patch5: 0004-Israel-now-falls-back-on-the-last-Sunday-of-October.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -38,11 +34,6 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
 pushd javazic
@@ -102,6 +93,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Fri Jul 26 2013 Petr Machata  - 2013d-1
+- Rebase to 2013d
+  - No fundamental changes
+  - Drop four patches introduced in 2013c-2
+
 * Thu Jul  4 2013 Petr Machata  - 2013c-2
 - Update descriptions in iso3166.tab; make Jerusalem coordinates in
   zone.tab more precise