From 1a9bbf49e5bf6d4a8618ad9cade9f5203922f7a8 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 13:40:39 +0000 Subject: [PATCH 001/280] Setup of module tzdata --- .cvsignore | 0 Makefile | 6 ++++++ sources | 0 3 files changed, 6 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..45736a0 --- /dev/null +++ b/Makefile @@ -0,0 +1,6 @@ +# Makefile for source rpm: tzdata +# $Id$ +NAME := tzdata +SPECFILE = $(firstword $(wildcard *.spec)) + +include ../common/Makefile.common diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From ea2813192ac27e28ff748af1a3e98b1d09b00f34 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 13:40:41 +0000 Subject: [PATCH 002/280] auto-import changelog data from tzdata-2003c-1.src.rpm Thu Sep 25 2003 Jakub Jelinek 2003c-1 - 2003c - updates for Brasil (#104840) Mon Jul 28 2003 Jakub Jelinek 2003a-2 - rebuilt Mon Jul 28 2003 Jakub Jelinek 2003a-1 - initial package --- .cvsignore | 2 ++ sources | 2 ++ tzdata.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 tzdata.spec diff --git a/.cvsignore b/.cvsignore index e69de29..068aaaf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +tzdata.tar.bz2 +tzdata2003c.tar.gz diff --git a/sources b/sources index e69de29..d529ff2 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 +0feaacca283d83317693f3c873e3e0ef tzdata2003c.tar.gz diff --git a/tzdata.spec b/tzdata.spec new file mode 100644 index 0000000..ef5b8b1 --- /dev/null +++ b/tzdata.spec @@ -0,0 +1,56 @@ +Summary: Timezone data +Name: tzdata +Version: 2003c +Release: 1 +Copyright: GPL +Group: System Environment/Base +Source0: %{name}.tar.bz2 +Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz +Patch: %{name}%{version}.patch +Buildroot: /var/tmp/tzdata-root +BuildRequires: gawk, glibc, glibc-common, perl +Conflicts: glibc-common <= 2.3.2-63 +BuildArchitectures: noarch + +%description +This package contains data files with rules for various timezones around +the world. + +%prep +%setup -n tzdata +mkdir %{name}%{version} +tar xzf %{SOURCE1} -C %{name}%{version} +cd %{name}%{version} +%patch -p0 +cd - + +%build +sed -e 's|@objpfx@|'`pwd`'/obj/|' \ + -e 's|@datadir@|%{_datadir}|' \ + -e 's|@install_root@|%{buildroot}|' \ + Makeconfig.in > Makeconfig +make + +%install +make install +echo ====================TESTING========================= +make check +echo ====================TESTING END===================== + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_datadir}/zoneinfo + +%changelog +* Thu Sep 25 2003 Jakub Jelinek 2003c-1 +- 2003c +- updates for Brasil (#104840) + +* Mon Jul 28 2003 Jakub Jelinek 2003a-2 +- rebuilt + +* Mon Jul 28 2003 Jakub Jelinek 2003a-1 +- initial package From 66ae63b7c4c06fa4587f4abf4652b927b8ddd41c Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 13:40:51 +0000 Subject: [PATCH 003/280] auto-import changelog data from tzdata-2003d-1.src.rpm Mon Oct 06 2003 Jakub Jelinek 2003d-1 - 2003d --- .cvsignore | 2 +- sources | 2 +- tzdata.spec | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 068aaaf..917a042 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ tzdata.tar.bz2 -tzdata2003c.tar.gz +tzdata2003d.tar.gz diff --git a/sources b/sources index d529ff2..c3dce2f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -0feaacca283d83317693f3c873e3e0ef tzdata2003c.tar.gz +83b74ef2d6efaa1f013c78da8fb81d7a tzdata2003d.tar.gz diff --git a/tzdata.spec b/tzdata.spec index ef5b8b1..51c3cbf 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,12 +1,11 @@ Summary: Timezone data Name: tzdata -Version: 2003c +Version: 2003d Release: 1 Copyright: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz -Patch: %{name}%{version}.patch Buildroot: /var/tmp/tzdata-root BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 @@ -20,9 +19,6 @@ the world. %setup -n tzdata mkdir %{name}%{version} tar xzf %{SOURCE1} -C %{name}%{version} -cd %{name}%{version} -%patch -p0 -cd - %build sed -e 's|@objpfx@|'`pwd`'/obj/|' \ @@ -45,6 +41,9 @@ rm -rf %{buildroot} %{_datadir}/zoneinfo %changelog +* Mon Oct 6 2003 Jakub Jelinek 2003d-1 +- 2003d + * Thu Sep 25 2003 Jakub Jelinek 2003c-1 - 2003c - updates for Brasil (#104840) From 8a8cb97d3692316b5090de1aaf532ba8d18c366c Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 13:42:30 +0000 Subject: [PATCH 004/280] auto-import changelog data from tzdata-2003d-2.src.rpm Fri Feb 13 2004 Elliot Lee - rebuilt --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 51c3cbf..c9b0552 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata Version: 2003d -Release: 1 +Release: 2 Copyright: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 @@ -41,6 +41,9 @@ rm -rf %{buildroot} %{_datadir}/zoneinfo %changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + * Mon Oct 6 2003 Jakub Jelinek 2003d-1 - 2003d From 863962bcbd0f2201b70684d96d4f24cf5a89864a Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 13:43:26 +0000 Subject: [PATCH 005/280] auto-import changelog data from tzdata-2004b-2.src.rpm Wed Aug 04 2004 Jakub Jelinek 2004d-2 - 2004b --- .cvsignore | 2 +- sources | 2 +- tzdata.spec | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 917a042..9b4de7c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ tzdata.tar.bz2 -tzdata2003d.tar.gz +tzdata2004b.tar.gz diff --git a/sources b/sources index c3dce2f..2b4d061 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -83b74ef2d6efaa1f013c78da8fb81d7a tzdata2003d.tar.gz +8e1443ccafd17648a105d15c0d63858f tzdata2004b.tar.gz diff --git a/tzdata.spec b/tzdata.spec index c9b0552..03a4957 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2003d +Version: 2004b Release: 2 Copyright: GPL Group: System Environment/Base @@ -41,8 +41,8 @@ rm -rf %{buildroot} %{_datadir}/zoneinfo %changelog -* Fri Feb 13 2004 Elliot Lee -- rebuilt +* Wed Aug 4 2004 Jakub Jelinek 2004d-2 +- 2004b * Mon Oct 6 2003 Jakub Jelinek 2003d-1 - 2003d From a351044fa58c18d46d9a9d16ba5d935501400b31 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 11 Oct 2004 19:15:05 +0000 Subject: [PATCH 006/280] 2004e-2 --- .cvsignore | 2 +- sources | 2 +- tzdata.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9b4de7c..8528904 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ tzdata.tar.bz2 -tzdata2004b.tar.gz +tzdata2004e.tar.gz diff --git a/sources b/sources index 2b4d061..7fbab5f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -8e1443ccafd17648a105d15c0d63858f tzdata2004b.tar.gz +36db3767814bc20270fdb5b3f85a7e21 tzdata2004e.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 03a4957..58d043e 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2004b +Version: 2004e Release: 2 Copyright: GPL Group: System Environment/Base @@ -41,7 +41,11 @@ rm -rf %{buildroot} %{_datadir}/zoneinfo %changelog -* Wed Aug 4 2004 Jakub Jelinek 2004d-2 +* Mon Oct 11 2004 Jakub Jelinek 2004e-2 +- 2004e (#135194) + - updates for Brazil, Uruguay and Argentina + +* Wed Aug 4 2004 Jakub Jelinek 2004b-2 - 2004b * Mon Oct 6 2003 Jakub Jelinek 2003d-1 @@ -49,7 +53,7 @@ rm -rf %{buildroot} * Thu Sep 25 2003 Jakub Jelinek 2003c-1 - 2003c -- updates for Brasil (#104840) +- updates for Brazil (#104840) * Mon Jul 28 2003 Jakub Jelinek 2003a-2 - rebuilt From 324e5070ccdea348e13404441db308ffc70591f7 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 29 Nov 2004 10:15:44 +0000 Subject: [PATCH 007/280] 2004g-1 --- .cvsignore | 2 +- sources | 2 +- tzdata.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8528904..b4d4243 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ tzdata.tar.bz2 -tzdata2004e.tar.gz +tzdata2004g.tar.gz diff --git a/sources b/sources index 7fbab5f..10fe617 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -36db3767814bc20270fdb5b3f85a7e21 tzdata2004e.tar.gz +a5af621e223758b3419c86d3b5c6b735 tzdata2004g.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 58d043e..377084b 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata -Version: 2004e -Release: 2 +Version: 2004g +Release: 1 Copyright: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 @@ -41,6 +41,10 @@ rm -rf %{buildroot} %{_datadir}/zoneinfo %changelog +* Mon Nov 29 2004 Jakub Jelinek 2004g-1 +- 2004g (#141107) + - updates for Cuba + * Mon Oct 11 2004 Jakub Jelinek 2004e-2 - 2004e (#135194) - updates for Brazil, Uruguay and Argentina From fa4cc5ff021f4d98fb12337bd8e460124f72fae5 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 26 Jan 2005 10:29:36 +0000 Subject: [PATCH 008/280] 2005c-2 --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index b4d4243..a0d320d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ tzdata.tar.bz2 -tzdata2004g.tar.gz +tzcode2005c.tar.gz diff --git a/sources b/sources index 10fe617..0a49271 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -a5af621e223758b3419c86d3b5c6b735 tzdata2004g.tar.gz +9e0c9df5fdd0ce0ec3425d13305e0071 tzcode2005c.tar.gz From c81d71d917d791a691006b76b26b6a80d064fdd0 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 26 Jan 2005 10:34:40 +0000 Subject: [PATCH 009/280] 2005c-2 --- .cvsignore | 2 +- sources | 2 +- tzdata.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index a0d320d..58c50ef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ tzdata.tar.bz2 -tzcode2005c.tar.gz +tzdata2005c.tar.gz diff --git a/sources b/sources index 0a49271..83ea3ff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -9e0c9df5fdd0ce0ec3425d13305e0071 tzcode2005c.tar.gz +569c614391e97e056bd4049ece2b8de1 tzdata2005c.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 377084b..d0f9925 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata -Version: 2004g -Release: 1 +Version: 2005c +Release: 2 Copyright: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 @@ -41,6 +41,10 @@ rm -rf %{buildroot} %{_datadir}/zoneinfo %changelog +* Wed Jan 26 2005 Jakub Jelinek 2005c-2 +- 2005c + - updates for Israel + * Mon Nov 29 2004 Jakub Jelinek 2004g-1 - 2004g (#141107) - updates for Cuba From fbca95d658a7eb86cc609dd87b55c6f3261469aa Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 26 Jan 2005 10:44:27 +0000 Subject: [PATCH 010/280] 2005c-3 --- tzdata.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index d0f9925..e4e22ab 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata Version: 2005c -Release: 2 +Release: 3 Copyright: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 @@ -41,9 +41,9 @@ rm -rf %{buildroot} %{_datadir}/zoneinfo %changelog -* Wed Jan 26 2005 Jakub Jelinek 2005c-2 +* Wed Jan 26 2005 Jakub Jelinek 2005c-3 - 2005c - - updates for Israel + - updates for Israel and Paraguay * Mon Nov 29 2004 Jakub Jelinek 2004g-1 - 2004g (#141107) From ef82c1da662d4bc393c3ec4c05dc59a80bd83826 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 1 Mar 2005 14:24:21 +0000 Subject: [PATCH 011/280] 2005f-2 --- tzdata.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index e4e22ab..6d9e1b5 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata -Version: 2005c -Release: 3 +Version: 2005f +Release: 2 Copyright: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 @@ -41,6 +41,10 @@ rm -rf %{buildroot} %{_datadir}/zoneinfo %changelog +* Tue Mar 1 2005 Jakub Jelinek 2005f-2 +- 2005f + - more updates for Israel, updates for Azerbaijan + * Wed Jan 26 2005 Jakub Jelinek 2005c-3 - 2005c - updates for Israel and Paraguay From 8fed61021051da84c6586fa14858a1d984b7811e Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 1 Mar 2005 14:32:30 +0000 Subject: [PATCH 012/280] 2005f-2 --- .cvsignore | 2 +- sources | 2 +- tzdata.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 58c50ef..1c7f49e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ tzdata.tar.bz2 -tzdata2005c.tar.gz +tzdata2005f.tar.gz diff --git a/sources b/sources index 83ea3ff..7e57200 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -569c614391e97e056bd4049ece2b8de1 tzdata2005c.tar.gz +898be3e528225711dc2feff505938520 tzdata2005f.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 6d9e1b5..c6d4054 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -2,7 +2,7 @@ Summary: Timezone data Name: tzdata Version: 2005f Release: 2 -Copyright: GPL +License: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz From 43232bd87c90e6d6dd48451693126d3bd1bb01e5 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 17 Mar 2005 15:06:26 +0000 Subject: [PATCH 013/280] tzdata2005g-2 --- .cvsignore | 3 ++- sources | 3 ++- tzdata.spec | 14 +++++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c7f49e..8dea828 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ tzdata.tar.bz2 -tzdata2005f.tar.gz +tzdata2005g.tar.gz +tzcode2005g.tar.gz diff --git a/sources b/sources index 7e57200..0829fe6 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -898be3e528225711dc2feff505938520 tzdata2005f.tar.gz +f650791d4bcf37250c0723661619b1f6 tzdata2005g.tar.gz +0319430cde95c3bad411b7dba6d35fbf tzcode2005g.tar.gz diff --git a/tzdata.spec b/tzdata.spec index c6d4054..3568eb6 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,11 +1,12 @@ Summary: Timezone data Name: tzdata -Version: 2005f +Version: 2005g Release: 2 License: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz +Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz Buildroot: /var/tmp/tzdata-root BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 @@ -19,6 +20,8 @@ the world. %setup -n tzdata mkdir %{name}%{version} tar xzf %{SOURCE1} -C %{name}%{version} +mkdir tzcode%{version} +tar xzf %{SOURCE2} -C tzcode%{version} %build sed -e 's|@objpfx@|'`pwd`'/obj/|' \ @@ -26,6 +29,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig make +grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html %install make install @@ -39,8 +43,16 @@ rm -rf %{buildroot} %files %defattr(-,root,root) %{_datadir}/zoneinfo +%doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu Mar 17 2005 Jakub Jelinek 2005g-2 +- 2005g + - fixes for Uruguay +- include README and Theory from tzcode tarball in %{_docdir}; + Theory includes a good summary of how the timezone data files + are supposed to be named + * Tue Mar 1 2005 Jakub Jelinek 2005f-2 - 2005f - more updates for Israel, updates for Azerbaijan From 8c27ee5e6e76b9bd6237c9f9ff22a58dc6995184 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 4 Apr 2005 21:47:51 +0000 Subject: [PATCH 014/280] 2005h-2 --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8dea828..ba9764e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ tzdata.tar.bz2 -tzdata2005g.tar.gz -tzcode2005g.tar.gz +tzdata2005h.tar.gz +tzcode2005h.tar.gz diff --git a/sources b/sources index 0829fe6..c3b7ebd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -f650791d4bcf37250c0723661619b1f6 tzdata2005g.tar.gz -0319430cde95c3bad411b7dba6d35fbf tzcode2005g.tar.gz +4c7aa406b55cce53b268ad4d274f33ba tzdata2005h.tar.gz +cc4d27cfad7a8405fa198afbbd514204 tzcode2005h.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 3568eb6..e2765de 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2005g +Version: 2005h Release: 2 License: GPL Group: System Environment/Base @@ -46,6 +46,10 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Mon Apr 4 2005 Jakub Jelinek 2005h-2 +- 2005h + - fixes for Kazakhstan + * Thu Mar 17 2005 Jakub Jelinek 2005g-2 - 2005g - fixes for Uruguay From 7bf7413d66695fea5944f0a58749ea7b8c019f7b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 30 Apr 2005 07:45:51 +0000 Subject: [PATCH 015/280] 2005i-2 --- tzdata.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index e2765de..abf78c4 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,12 +1,12 @@ Summary: Timezone data Name: tzdata -Version: 2005h +Version: 2005i Release: 2 License: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz -Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz +Source2: ftp://elsie.nci.nih.gov/pub/tzcode2005h.tar.gz Buildroot: /var/tmp/tzdata-root BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 @@ -46,6 +46,10 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Sat Apr 30 2005 Jakub Jelinek 2005i-2 +- 2005i + - updates for Lybia, Iran, Haiti and Nicaragua + * Mon Apr 4 2005 Jakub Jelinek 2005h-2 - 2005h - fixes for Kazakhstan From 24a5d9690cb47c87bbf939fb771ba69444848ac4 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 30 Apr 2005 07:51:52 +0000 Subject: [PATCH 016/280] 2005i-2 --- .cvsignore | 2 +- sources | 2 +- tzdata.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index ba9764e..99b9fce 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ tzdata.tar.bz2 -tzdata2005h.tar.gz tzcode2005h.tar.gz +tzdata2005i.tar.gz diff --git a/sources b/sources index c3b7ebd..02b7cd4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -4c7aa406b55cce53b268ad4d274f33ba tzdata2005h.tar.gz cc4d27cfad7a8405fa198afbbd514204 tzcode2005h.tar.gz +d07eb62fdf0500ee74e5fceaaf24091e tzdata2005i.tar.gz diff --git a/tzdata.spec b/tzdata.spec index abf78c4..20af5f6 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -48,7 +48,7 @@ rm -rf %{buildroot} %changelog * Sat Apr 30 2005 Jakub Jelinek 2005i-2 - 2005i - - updates for Lybia, Iran, Haiti and Nicaragua + - updates for Iran, Haiti and Nicaragua * Mon Apr 4 2005 Jakub Jelinek 2005h-2 - 2005h From a1ae621061a625c1b1c6509706b1382b2ab5b0ad Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 15 Jul 2005 11:05:33 +0000 Subject: [PATCH 017/280] 2005k-2 --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 99b9fce..ba85821 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ tzdata.tar.bz2 -tzcode2005h.tar.gz -tzdata2005i.tar.gz +tzcode2005k.tar.gz +tzdata2005k.tar.gz diff --git a/sources b/sources index 02b7cd4..627c7da 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -cc4d27cfad7a8405fa198afbbd514204 tzcode2005h.tar.gz -d07eb62fdf0500ee74e5fceaaf24091e tzdata2005i.tar.gz +c742a6fb366bea9da92f5f594ebd584d tzcode2005k.tar.gz +35f360d3515c81ae6b48d16e81966bdc tzdata2005k.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 20af5f6..0b26daf 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,12 +1,12 @@ Summary: Timezone data Name: tzdata -Version: 2005i +Version: 2005k Release: 2 License: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz -Source2: ftp://elsie.nci.nih.gov/pub/tzcode2005h.tar.gz +Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz Buildroot: /var/tmp/tzdata-root BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 @@ -46,6 +46,10 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Fri Jul 15 2005 Jakub Jelinek 2005k-2 +- 2005k + - leap seconds update + * Sat Apr 30 2005 Jakub Jelinek 2005i-2 - 2005i - updates for Iran, Haiti and Nicaragua From a3db8fe21c06dc1dd111fbec74ea25138bbd4c3f Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 6 Sep 2005 10:33:56 +0000 Subject: [PATCH 018/280] 2005m-1 --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 9 +++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index ba85821..0c7fac9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ tzdata.tar.bz2 -tzcode2005k.tar.gz -tzdata2005k.tar.gz +tzcode2005m.tar.gz +tzdata2005m.tar.gz diff --git a/sources b/sources index 627c7da..33edc0e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -c742a6fb366bea9da92f5f594ebd584d tzcode2005k.tar.gz -35f360d3515c81ae6b48d16e81966bdc tzdata2005k.tar.gz +ed8bc594989edefb418a8803bcaf09d6 tzcode2005m.tar.gz +536a39879579a5fc6b9347dfa845a11c tzdata2005m.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 0b26daf..d3ce496 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata -Version: 2005k -Release: 2 +Version: 2005m +Release: 1 License: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 @@ -46,6 +46,11 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Tue Sep 6 2005 Jakub Jelinek 2005m-1 +- 2005m + - changes for USA (extending DST by 4 weeks since 2007), Tunisia, Australia + - historical timezone data changes for Japan, Poland, Northern Ireland + * Fri Jul 15 2005 Jakub Jelinek 2005k-2 - 2005k - leap seconds update From fc94ac9e679525e44d54c77726f3bf3c2cfff72a Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 6 Sep 2005 11:05:46 +0000 Subject: [PATCH 019/280] 2005m-2 --- tzdata.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index d3ce496..04606e6 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata Version: 2005m -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 @@ -46,10 +46,13 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog -* Tue Sep 6 2005 Jakub Jelinek 2005m-1 +* Tue Sep 6 2005 Jakub Jelinek 2005m-2 - 2005m - - changes for USA (extending DST by 4 weeks since 2007), Tunisia, Australia - - historical timezone data changes for Japan, Poland, Northern Ireland + - changes for USA (extending DST by 4 weeks since 2007), Tunisia, + Australia, Kazakhstan + - historical timezone data changes for Japan, Poland, Northern Ireland and + Mali + - timezone name change for East Timor * Fri Jul 15 2005 Jakub Jelinek 2005k-2 - 2005k From 91747bc2c9cd02a6a30d5c56215704af8e24a28f Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 2 Nov 2005 12:07:37 +0000 Subject: [PATCH 020/280] 2005n-2 --- sources | 4 ++-- tzdata.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 33edc0e..712a448 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -ed8bc594989edefb418a8803bcaf09d6 tzcode2005m.tar.gz -536a39879579a5fc6b9347dfa845a11c tzdata2005m.tar.gz +bee0af62d8071698fcae7afd33103b8a tzcode2005n.tar.gz +850c65397e88be9a5fb804b42df8837f tzdata2005n.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 04606e6..3333ba5 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2005m +Version: 2005n Release: 2 License: GPL Group: System Environment/Base @@ -46,6 +46,10 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Wed Nov 2 2005 Jakub Jelinek 2005n-2 +- 2005n + - changes for Kyrgyzstan and Uruguay + * Tue Sep 6 2005 Jakub Jelinek 2005m-2 - 2005m - changes for USA (extending DST by 4 weeks since 2007), Tunisia, From 30f00dfd60d095c44b67aaad1997107f7fbd024f Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 2 Nov 2005 12:23:26 +0000 Subject: [PATCH 021/280] 2005n-2 --- sources | 2 +- tzdata.spec | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sources b/sources index 712a448..1c0bcf3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 +3a1d09ec2643ae8472ec2969c014f53a tzdata.tar.bz2 bee0af62d8071698fcae7afd33103b8a tzcode2005n.tar.gz 850c65397e88be9a5fb804b42df8837f tzdata2005n.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 3333ba5..28d2bb8 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -49,6 +49,8 @@ rm -rf %{buildroot} * Wed Nov 2 2005 Jakub Jelinek 2005n-2 - 2005n - changes for Kyrgyzstan and Uruguay +- fix a typo in the Makefile (used TZDATA env var instead of TZDIR during + make check), update tst-timezone.c and test-tz.c from glibc CVS (#172102) * Tue Sep 6 2005 Jakub Jelinek 2005m-2 - 2005m From 1822cf5401bda97e8fa78d1e330faaf02db8312c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 2 Nov 2005 12:30:37 +0000 Subject: [PATCH 022/280] 2005n-2 --- .cvsignore | 4 ++-- sources | 2 +- tzdata.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0c7fac9..4e7a46b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ tzdata.tar.bz2 -tzcode2005m.tar.gz -tzdata2005m.tar.gz +tzcode2005n.tar.gz +tzdata2005n.tar.gz diff --git a/sources b/sources index 1c0bcf3..39e4ccf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -3a1d09ec2643ae8472ec2969c014f53a tzdata.tar.bz2 +325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 bee0af62d8071698fcae7afd33103b8a tzcode2005n.tar.gz 850c65397e88be9a5fb804b42df8837f tzdata2005n.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 28d2bb8..7db5433 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -50,7 +50,7 @@ rm -rf %{buildroot} - 2005n - changes for Kyrgyzstan and Uruguay - fix a typo in the Makefile (used TZDATA env var instead of TZDIR during - make check), update tst-timezone.c and test-tz.c from glibc CVS (#172102) + make check), update tst-timezone.c from glibc CVS (#172102) * Tue Sep 6 2005 Jakub Jelinek 2005m-2 - 2005m From f786a2194f62ceb2f7807181f5739c2fecb80393 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 9 Dec 2005 22:43:40 +0000 Subject: [PATCH 023/280] gcc update bump --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 7db5433..6d369ed 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata Version: 2005n -Release: 2 +Release: 2.1 License: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 @@ -46,6 +46,9 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Fri Dec 09 2005 Jesse Keating +- rebuilt + * Wed Nov 2 2005 Jakub Jelinek 2005n-2 - 2005n - changes for Kyrgyzstan and Uruguay From 3ac83294513a8f82936e0efa9bb4cd80d270410f Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 17 Dec 2005 10:02:32 +0000 Subject: [PATCH 024/280] 2005q-2 --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 10 ++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4e7a46b..54be37f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ tzdata.tar.bz2 -tzcode2005n.tar.gz -tzdata2005n.tar.gz +tzcode2005q.tar.gz +tzdata2005q.tar.gz diff --git a/sources b/sources index 39e4ccf..e4c8d8c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 -bee0af62d8071698fcae7afd33103b8a tzcode2005n.tar.gz -850c65397e88be9a5fb804b42df8837f tzdata2005n.tar.gz +1177f3301dad001c337ebfcb68f7a8dc tzcode2005q.tar.gz +63551b3b24d37340cdc92d26c6c38195 tzdata2005q.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 6d369ed..b17a582 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata -Version: 2005n -Release: 2.1 +Version: 2005q +Release: 2 License: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 @@ -46,8 +46,10 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Sat Dec 17 2005 Jakub Jelinek 2005q-2 +- 2005q + - changes for Georgia, Azerbaijan, Jordan, Palestine, Cuba, Nicaragua + - SystemV timezone changes * Wed Nov 2 2005 Jakub Jelinek 2005n-2 - 2005n From a714b1b0a966c68b1285088753ffdd7ee589a30f Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 6 Jan 2006 09:19:18 +0000 Subject: [PATCH 025/280] Upstream changes. --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 14 +++++++++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 54be37f..d741dfb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ tzdata.tar.bz2 -tzcode2005q.tar.gz -tzdata2005q.tar.gz +tzdata2005r.tar.gz +tzcode2005r.tar.gz diff --git a/sources b/sources index e4c8d8c..4dd9947 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 -1177f3301dad001c337ebfcb68f7a8dc tzcode2005q.tar.gz -63551b3b24d37340cdc92d26c6c38195 tzdata2005q.tar.gz +b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz +063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz diff --git a/tzdata.spec b/tzdata.spec index b17a582..931a461 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2005q +Version: 2005r Release: 2 License: GPL Group: System Environment/Base @@ -46,6 +46,18 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu Jan 5 2006 Petr Machata 2005r-2 +- 2005r + - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to + northamerica to guard against old files with obsolete information + being left in the time zone binary directory. + - Changes for countries that are supposed to join 2007 US DST + change. This includes most of Canada, however entries already in + the database (Alberta, British Columbia, Newfoundland, Northwest + Territories, and Yukon) were left alone for the time being. + - Fixes in zdump.c (abbrok): conditions are chained, and the string + is checked for emptiness. + * Sat Dec 17 2005 Jakub Jelinek 2005q-2 - 2005q - changes for Georgia, Azerbaijan, Jordan, Palestine, Cuba, Nicaragua From 860efa27776096747df0443a2d9610a8ea2d76a9 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 12 Jan 2006 16:12:07 +0000 Subject: [PATCH 026/280] Meta-package changes: Renaming tzdata.tar.bz2 file to tzdata$ver-base, so that it won't clash across updates. --- .cvsignore | 2 +- sources | 2 +- tzdata.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index d741dfb..ab20998 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzdata.tar.bz2 +tzdata2005r-base.tar.bz2 tzdata2005r.tar.gz tzcode2005r.tar.gz diff --git a/sources b/sources index 4dd9947..57c65cb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 +325dba39b9741b63b94e4c05a3fefd5c tzdata2005r-base.tar.bz2 b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz 063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 931a461..6bb8317 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,10 +1,10 @@ Summary: Timezone data Name: tzdata Version: 2005r -Release: 2 +Release: 3 License: GPL Group: System Environment/Base -Source0: %{name}.tar.bz2 +Source0: %{name}%{version}-base.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz Buildroot: /var/tmp/tzdata-root @@ -46,6 +46,11 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Mon Jan 12 2006 Petr Machata 2005r-3 +- 2005r-3 + - Meta changes. Renaming tzdata.tar.bz2 file to tzdata$ver-base, + so that it won't clash across updates. + * Thu Jan 5 2006 Petr Machata 2005r-2 - 2005r - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to From a394bcd2fcff26b7d0ad77e052773b2a6556c36c Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 2 Feb 2006 19:55:43 +0000 Subject: [PATCH 027/280] - Upstream 2006a: - private.h(scheck): changing char* to char const* - Rule changes for Palestine, zone changes for Indiana/US, both changes for Canada. - Many related doc changes. - Naming scheme in spec file doesn't use %%{name}, but tzdata. --- .cvsignore | 6 +++--- sources | 6 +++--- tzdata.spec | 18 +++++++++++++----- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index ab20998..47a1c2d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzdata2005r-base.tar.bz2 -tzdata2005r.tar.gz -tzcode2005r.tar.gz +tzdata2006a-base.tar.bz2 +tzdata2006a.tar.gz +tzcode2006a.tar.gz diff --git a/sources b/sources index 57c65cb..7793dd1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -325dba39b9741b63b94e4c05a3fefd5c tzdata2005r-base.tar.bz2 -b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz -063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz +325dba39b9741b63b94e4c05a3fefd5c tzdata2006a-base.tar.bz2 +69e6b498bf4b8d66568fa9a7816b6321 tzdata2006a.tar.gz +00c545c57ce1bbfbc550eb21244cf57b tzcode2006a.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 6bb8317..837a89b 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,11 +1,11 @@ Summary: Timezone data Name: tzdata -Version: 2005r -Release: 3 +Version: 2006a +Release: 1 License: GPL Group: System Environment/Base -Source0: %{name}%{version}-base.tar.bz2 -Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz +Source0: tzdata%{version}-base.tar.bz2 +Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz Buildroot: /var/tmp/tzdata-root BuildRequires: gawk, glibc, glibc-common, perl @@ -46,7 +46,15 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog -* Mon Jan 12 2006 Petr Machata 2005r-3 +* Thu Feb 02 2006 Petr Machata 2006a-1 +- Upstream 2006a: + - private.h(scheck): changing char* to char const* + - Rule changes for Palestine, zone changes for Indiana/US, both + changes for Canada. + - Many related doc changes. +- Naming scheme in spec file doesn't use %%{name}, but tzdata. + +* Thu Jan 12 2006 Petr Machata 2005r-3 - 2005r-3 - Meta changes. Renaming tzdata.tar.bz2 file to tzdata$ver-base, so that it won't clash across updates. From 493c24eb1a6daa59670efa2d81b71c8a77e2be0e Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 9 Feb 2006 13:19:31 +0000 Subject: [PATCH 028/280] Minor changes. --- .cvsignore | 2 +- sources | 2 +- tzdata.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 47a1c2d..254d021 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzdata2006a-base.tar.bz2 +tzdata2006a-2-base.tar.bz2 tzdata2006a.tar.gz tzcode2006a.tar.gz diff --git a/sources b/sources index 7793dd1..d2f1742 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -325dba39b9741b63b94e4c05a3fefd5c tzdata2006a-base.tar.bz2 +906a4c98cc5240f416524a256b039c42 tzdata2006a-2-base.tar.bz2 69e6b498bf4b8d66568fa9a7816b6321 tzdata2006a.tar.gz 00c545c57ce1bbfbc550eb21244cf57b tzcode2006a.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 837a89b..824a6fd 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,10 +1,10 @@ Summary: Timezone data Name: tzdata Version: 2006a -Release: 1 +Release: 2 License: GPL Group: System Environment/Base -Source0: tzdata%{version}-base.tar.bz2 +Source0: tzdata%{version}-%{release}-base.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz Buildroot: /var/tmp/tzdata-root @@ -22,12 +22,12 @@ mkdir %{name}%{version} tar xzf %{SOURCE1} -C %{name}%{version} mkdir tzcode%{version} tar xzf %{SOURCE2} -C tzcode%{version} - -%build sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig + +%build make grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html @@ -46,6 +46,9 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu Feb 02 2006 Petr Machata 2006a-2 +- Small changes in tst-timezone.c + * Thu Feb 02 2006 Petr Machata 2006a-1 - Upstream 2006a: - private.h(scheck): changing char* to char const* From 6a75c1ac5c610f707a88cfd7e9514628a480677b Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 22 Feb 2006 14:29:41 +0000 Subject: [PATCH 029/280] - Upstream 2006b: - using tz64code version, as 32 is legacy according to tzdata ML - new manual pages for ctime, strftime, tzset - some source code reorganizations - no timezone/dst rule updates --- .cvsignore | 6 +++--- sources | 6 +++--- tzdata.spec | 15 +++++++++++---- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 254d021..c6b2efa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzdata2006a-2-base.tar.bz2 -tzdata2006a.tar.gz -tzcode2006a.tar.gz +tzdata2006b-1-base.tar.bz2 +tzdata2006b.tar.gz +tz64code2006b.tar.gz diff --git a/sources b/sources index d2f1742..f447a5b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -906a4c98cc5240f416524a256b039c42 tzdata2006a-2-base.tar.bz2 -69e6b498bf4b8d66568fa9a7816b6321 tzdata2006a.tar.gz -00c545c57ce1bbfbc550eb21244cf57b tzcode2006a.tar.gz +906a4c98cc5240f416524a256b039c42 tzdata2006b-1-base.tar.bz2 +244523d10f93f392d96da4ef11b6cdd7 tzdata2006b.tar.gz +37524ee1c072a51511a6c220f8faf95f tz64code2006b.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 824a6fd..61eafd9 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,16 +1,16 @@ Summary: Timezone data Name: tzdata -Version: 2006a -Release: 2 +Version: 2006b +Release: 1 License: GPL Group: System Environment/Base Source0: tzdata%{version}-%{release}-base.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz -Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz -Buildroot: /var/tmp/tzdata-root +Source2: ftp://elsie.nci.nih.gov/pub/tz64code%{version}.tar.gz BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch +Buildroot: %{_tmppath}/%{name}-root %description This package contains data files with rules for various timezones around @@ -46,6 +46,13 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu Feb 22 2006 Petr Machata 2006b-1 +- Upstream 2006b: + - using tz64code version, as 32 is legacy according to tzdata ML + - new manual pages for ctime, strftime, tzset + - some source code reorganizations + - no timezone/dst rule updates + * Thu Feb 02 2006 Petr Machata 2006a-2 - Small changes in tst-timezone.c From 0cc7b0c652f344250dda5ef4ab6149101d66a274 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 22 Mar 2006 09:45:45 +0000 Subject: [PATCH 030/280] - Patch for Sri Lanka time zone change (#184514) - Few changes in package organization --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 11 +++++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index c6b2efa..59bdffb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzdata2006b-1-base.tar.bz2 -tzdata2006b.tar.gz +tzdata-base-0.tar.bz2 tz64code2006b.tar.gz +tzdata2006b.tar.gz diff --git a/sources b/sources index f447a5b..3a9d642 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -906a4c98cc5240f416524a256b039c42 tzdata2006b-1-base.tar.bz2 -244523d10f93f392d96da4ef11b6cdd7 tzdata2006b.tar.gz +906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 37524ee1c072a51511a6c220f8faf95f tz64code2006b.tar.gz +244523d10f93f392d96da4ef11b6cdd7 tzdata2006b.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 61eafd9..fd48daf 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,12 +1,13 @@ Summary: Timezone data Name: tzdata Version: 2006b -Release: 1 +Release: 2 License: GPL Group: System Environment/Base -Source0: tzdata%{version}-%{release}-base.tar.bz2 +Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tz64code%{version}.tar.gz +Patch0: tzdata2006b-srilanka.patch BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -26,6 +27,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig +%patch0 -p1 %build make @@ -33,6 +35,8 @@ grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html %install make install + +%check echo ====================TESTING========================= make check echo ====================TESTING END===================== @@ -46,6 +50,9 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu Mar 16 2006 Petr Machata - 2006b-2 +- Patch for Sri Lanka time zone change (#184514) + * Thu Feb 22 2006 Petr Machata 2006b-1 - Upstream 2006b: - using tz64code version, as 32 is legacy according to tzdata ML From 016cf8023a85f6942a3874935d0b92b9f5ee36d8 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 6 Apr 2006 12:15:34 +0000 Subject: [PATCH 031/280] Upstream 2006c. --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 22 +++++++++++++++++----- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 59bdffb..df8d117 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ +tzcode2006c.tar.gz +tzdata2006c.tar.gz tzdata-base-0.tar.bz2 -tz64code2006b.tar.gz -tzdata2006b.tar.gz diff --git a/sources b/sources index 3a9d642..c810a98 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ +2100d0b0c6f2ad320260290e5dc7e957 tzcode2006c.tar.gz +420d97a09c9750839afc2703f6b8276f tzdata2006c.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 -37524ee1c072a51511a6c220f8faf95f tz64code2006b.tar.gz -244523d10f93f392d96da4ef11b6cdd7 tzdata2006b.tar.gz diff --git a/tzdata.spec b/tzdata.spec index fd48daf..5c50ee3 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,13 +1,12 @@ Summary: Timezone data Name: tzdata -Version: 2006b -Release: 2 +Version: 2006c +Release: 1 License: GPL Group: System Environment/Base Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz -Source2: ftp://elsie.nci.nih.gov/pub/tz64code%{version}.tar.gz -Patch0: tzdata2006b-srilanka.patch +Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -27,7 +26,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig -%patch0 -p1 %build make @@ -50,6 +48,20 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu Apr 6 2006 Petr Machata - 2006c-1 +- Upstream 2006c + - Time-related changes: + - dozens of historical and commentary changes + - Iran stopped observing DST + - Sri Lanka switches from UTC+6 to UTC+5:30 + - America/Thule and America/Edmonton will adopt new US rules, + starting 2007 + - Tunisia is adopting regular DST + - Code: + - asctime.c: Chages in format strings to silent gcc warnings + - removing K&R notation from function signatures + - few fixes across the code + * Thu Mar 16 2006 Petr Machata - 2006b-2 - Patch for Sri Lanka time zone change (#184514) From 7cc17b53a8eac2b2825a4dbe9f79807485a6c477 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 20 Apr 2006 14:17:25 +0000 Subject: [PATCH 032/280] Upstream 2006d --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 9 ++++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index df8d117..6f2e379 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2006c.tar.gz -tzdata2006c.tar.gz +tzcode2006d.tar.gz +tzdata2006d.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index c810a98..190bc4c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -2100d0b0c6f2ad320260290e5dc7e957 tzcode2006c.tar.gz -420d97a09c9750839afc2703f6b8276f tzdata2006c.tar.gz +4ffb3a8c0b1f604cba0bae16d5d8c6b4 tzcode2006d.tar.gz +553bfb094e823dc14ed97013c536b90d tzdata2006d.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 5c50ee3..0a34a62 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2006c +Version: 2006d Release: 1 License: GPL Group: System Environment/Base @@ -48,6 +48,13 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu Apr 20 2006 Petr Machata - 2006d-1 +- Upstream 2006d + - Haiti observes DST + - Sri Lanka change actually took effect Apr/15 + - All Canada is now scheduled for 2007 US DST rules + - Some historical fixes + * Thu Apr 6 2006 Petr Machata - 2006c-1 - Upstream 2006c - Time-related changes: From e937abc0ee1d9034d40fd947a799dba69eb2e64d Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 2 May 2006 12:09:32 +0000 Subject: [PATCH 033/280] - Upstream 2006f - America/Guatemala observes DST between Apr/30 and Oct/1 - Historical changes for Nicaragua - Update of America/Indiana/Vincennes in zone table --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 8 +++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6f2e379..5ce13fc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2006d.tar.gz -tzdata2006d.tar.gz +tzcode2006f.tar.gz +tzdata2006f.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index 190bc4c..4359980 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -4ffb3a8c0b1f604cba0bae16d5d8c6b4 tzcode2006d.tar.gz -553bfb094e823dc14ed97013c536b90d tzdata2006d.tar.gz +b7a279dff4ca44ef3b30150c2b3037b5 tzcode2006f.tar.gz +1788e735a69e3a603bd2869364ef0ed4 tzdata2006f.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 0a34a62..75cfc08 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2006d +Version: 2006f Release: 1 License: GPL Group: System Environment/Base @@ -48,6 +48,12 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Tue May 2 2006 Petr Machata - 2006f-1 +- Upstream 2006f + - America/Guatemala observes DST between Apr/30 and Oct/1 + - Historical changes for Nicaragua + - Update of America/Indiana/Vincennes in zone table + * Thu Apr 20 2006 Petr Machata - 2006d-1 - Upstream 2006d - Haiti observes DST From 950605fb4847efb16a4ae29b567fcaeb628cf76b Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 11 May 2006 08:33:03 +0000 Subject: [PATCH 034/280] - Honduras chose to follow Guatemala and will observe DST May/6 to Sep/2 - Nicaragua updates --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5ce13fc..b3dde28 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2006f.tar.gz -tzdata2006f.tar.gz +tzcode2006g.tar.gz +tzdata2006g.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index 4359980..3ecb9f1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -b7a279dff4ca44ef3b30150c2b3037b5 tzcode2006f.tar.gz -1788e735a69e3a603bd2869364ef0ed4 tzdata2006f.tar.gz +4091e3f764a296b476bb77cf8eda01c7 tzcode2006g.tar.gz +fed13df17e2e386f4c31b0962d3ed356 tzdata2006g.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 75cfc08..b5634ec 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2006f +Version: 2006g Release: 1 License: GPL Group: System Environment/Base @@ -48,6 +48,10 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu May 11 2006 Petr Machata - 2006g-1 +- Honduras chose to follow Guatemala and will observe DST May/6 to Sep/2 +- Nicaragua updates + * Tue May 2 2006 Petr Machata - 2006f-1 - Upstream 2006f - America/Guatemala observes DST between Apr/30 and Oct/1 From b502d0777142c30c97d9c04fee2bdbb2651a65a8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 12 Jul 2006 08:35:07 +0000 Subject: [PATCH 035/280] bumped for rebuild --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index b5634ec..bcf40d3 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata Version: 2006g -Release: 1 +Release: 1.1 License: GPL Group: System Environment/Base Source0: tzdata-base-0.tar.bz2 @@ -48,6 +48,9 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Wed Jul 12 2006 Jesse Keating - 2006g-1.1 +- rebuild + * Thu May 11 2006 Petr Machata - 2006g-1 - Honduras chose to follow Guatemala and will observe DST May/6 to Sep/2 - Nicaragua updates From 6b92e3a7b3b0136bea42ef27500f0e8aa1156567 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 22 Aug 2006 14:52:10 +0000 Subject: [PATCH 036/280] - Upstream 2006j - Honduras stopped observing DST on Monday at 00:00 - America/Bermuda will follow the US's lead next year - America/Moncton will use US-style rules next year - New Zone America/Blanc-Sablon, for Canadians who observe AST all year - New zone: America/Atikokan instead of America/Coral_Harbour - New zones: Europe/Jersey, Europe/Guernsey, Europe/Isle_of_Man - Historical changes - Commentary updates - Upstream 2006i - localtime.c fixes - Upstream 2006h - zic leapsecond fix --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 20 ++++++++++++++++++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index b3dde28..c26f423 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2006g.tar.gz -tzdata2006g.tar.gz +tzcode2006j.tar.gz +tzdata2006j.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index 3ecb9f1..b6c57da 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -4091e3f764a296b476bb77cf8eda01c7 tzcode2006g.tar.gz -fed13df17e2e386f4c31b0962d3ed356 tzdata2006g.tar.gz +0920ba0a68ab02681fe390dbc2a9c33d tzcode2006j.tar.gz +fef20ce476ec31b6c5a760eed3b358c0 tzdata2006j.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index bcf40d3..54de65b 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata -Version: 2006g -Release: 1.1 +Version: 2006j%{?dist} +Release: 1 License: GPL Group: System Environment/Base Source0: tzdata-base-0.tar.bz2 @@ -48,6 +48,22 @@ rm -rf %{buildroot} %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Tue Aug 22 2006 Petr Machata - 2006j-1 +- Upstream 2006j + - Honduras stopped observing DST on Monday at 00:00 + - America/Bermuda will follow the US's lead next year + - America/Moncton will use US-style rules next year + - New Zone America/Blanc-Sablon, for Canadians who observe AST all + year + - New zone: America/Atikokan instead of America/Coral_Harbour + - New zones: Europe/Jersey, Europe/Guernsey, Europe/Isle_of_Man + - Historical changes + - Commentary updates +- Upstream 2006i + - localtime.c fixes +- Upstream 2006h + - zic leapsecond fix + * Wed Jul 12 2006 Jesse Keating - 2006g-1.1 - rebuild From 5ecc643d418d23ccebc7027547d28a1370436fc9 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 22 Aug 2006 14:57:38 +0000 Subject: [PATCH 037/280] fix tag --- tzdata.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 54de65b..517cbd6 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata -Version: 2006j%{?dist} -Release: 1 +Version: 2006j +Release: 1%{?dist} License: GPL Group: System Environment/Base Source0: tzdata-base-0.tar.bz2 From 793d7240f6b9af1b4dd532314274977e746e502a Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 21 Sep 2006 14:03:39 +0000 Subject: [PATCH 038/280] - Upstream 2006k, 2006l: - Adjustments for Egypt, Palestine, Cuba, Honduras - Documentation changes --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 27 ++++++++++++++++++--------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index c26f423..ecff037 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2006j.tar.gz -tzdata2006j.tar.gz +tzcode2006k.tar.gz +tzdata2006l.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index b6c57da..418768c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -0920ba0a68ab02681fe390dbc2a9c33d tzcode2006j.tar.gz -fef20ce476ec31b6c5a760eed3b358c0 tzdata2006j.tar.gz +ada0f094380030b9b4479def5f58231d tzcode2006k.tar.gz +8f1c7aeeb9674feb25e0a9764517f980 tzdata2006l.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 517cbd6..7c21a6b 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,12 +1,14 @@ Summary: Timezone data Name: tzdata -Version: 2006j +Version: 2006l +%define tzdata_version %{version} +%define tzcode_version 2006k Release: 1%{?dist} License: GPL Group: System Environment/Base Source0: tzdata-base-0.tar.bz2 -Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz -Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz +Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz +Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -18,10 +20,10 @@ the world. %prep %setup -n tzdata -mkdir %{name}%{version} -tar xzf %{SOURCE1} -C %{name}%{version} -mkdir tzcode%{version} -tar xzf %{SOURCE2} -C tzcode%{version} +mkdir tzdata%{tzdata_version} +tar xzf %{SOURCE1} -C tzdata%{tzdata_version} +mkdir tzcode%{tzcode_version} +tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ -e 's|@install_root@|%{buildroot}|' \ @@ -29,7 +31,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ %build make -grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html +grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version}/tz-link.html %install make install @@ -45,9 +47,16 @@ rm -rf %{buildroot} %files %defattr(-,root,root) %{_datadir}/zoneinfo -%doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html +%doc tzcode%{tzcode_version}/README +%doc tzcode%{tzcode_version}/Theory +%doc tzcode%{tzcode_version}/tz-link.html %changelog +* Thu Sep 21 2006 Petr Machata - 2006l-1 +- Upstream 2006k, 2006l: + - Adjustments for Egypt, Palestine, Cuba, Honduras + - Documentation changes + * Tue Aug 22 2006 Petr Machata - 2006j-1 - Upstream 2006j - Honduras stopped observing DST on Monday at 00:00 From 8ec952cf12c572735e7a6ddc0890bad3fdc107a7 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 3 Oct 2006 08:17:44 +0000 Subject: [PATCH 039/280] - Upstream 2006m: - Adjustments for Egypt, Palestine, Uruguay - Better description of `until' field in zic (8) manpage --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 9 +++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index ecff037..168fdf6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2006k.tar.gz -tzdata2006l.tar.gz +tzcode2006m.tar.gz +tzdata2006m.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index 418768c..1e19969 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -ada0f094380030b9b4479def5f58231d tzcode2006k.tar.gz -8f1c7aeeb9674feb25e0a9764517f980 tzdata2006l.tar.gz +355add0f26c418d4d440a3aba4fee7fb tzcode2006m.tar.gz +61c7891bef743d6f58312e7e86f990ef tzdata2006m.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 7c21a6b..ea07da9 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2006l +Version: 2006m %define tzdata_version %{version} -%define tzcode_version 2006k +%define tzcode_version %{version} Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -52,6 +52,11 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Tue Oct 3 2006 Petr Machata - 2006m-1 +- Upstream 2006m: + - Adjustments for Egypt, Palestine, Uruguay + - Better description of `until' field in zic (8) manpage + * Thu Sep 21 2006 Petr Machata - 2006l-1 - Upstream 2006k, 2006l: - Adjustments for Egypt, Palestine, Cuba, Honduras From ab875d0f1f260aef2b59772caf782e232181e72f Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 10 Oct 2006 10:54:57 +0000 Subject: [PATCH 040/280] - Proposed upstream patch (#210058) - Jordan will switch to winter time on October 27, not September 29 - Brazil's DST this year is the first Sunday in November to the last Sunday in February. (Thanks to Frederico A. C. Neves.) - ISO 3166 codes for Serbia and Montenegro, zone Europe/Podgorica - Commentary and past timestamps changes Resolves: #210058 --- tzdata.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index ea07da9..6288bbb 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,12 +3,13 @@ Name: tzdata Version: 2006m %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +Patch0: tzdata-2006m-brazil.patch BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -28,6 +29,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig +%patch0 -p1 %build make @@ -52,6 +54,14 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Tue Oct 10 2006 Petr Machata - 2006m-2 +- Proposed upstream patch (#210058) + - Jordan will switch to winter time on October 27, not September 29 + - Brazil's DST this year is the first Sunday in November to the last + Sunday in February. (Thanks to Frederico A. C. Neves.) + - ISO 3166 codes for Serbia and Montenegro, zone Europe/Podgorica + - Commentary and past timestamps changes + * Tue Oct 3 2006 Petr Machata - 2006m-1 - Upstream 2006m: - Adjustments for Egypt, Palestine, Uruguay From fce7d9a270ecf5627544d244045dca6e02752dca Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 9 Nov 2006 13:59:37 +0000 Subject: [PATCH 041/280] - Cuba has ended its three years of permanent DST. - Updates in historical timestamps for Chile. --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 10 ++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 168fdf6..475cde6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2006m.tar.gz -tzdata2006m.tar.gz +tzcode2006o.tar.gz +tzdata2006o.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index 1e19969..2cf5311 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -355add0f26c418d4d440a3aba4fee7fb tzcode2006m.tar.gz -61c7891bef743d6f58312e7e86f990ef tzdata2006m.tar.gz +352ca2fc0fffc02fa38c7ab0ceeb3b34 tzcode2006o.tar.gz +1dc760409e9a7e6a2f29152d26503c5d tzdata2006o.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 6288bbb..2a16edb 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,15 +1,14 @@ Summary: Timezone data Name: tzdata -Version: 2006m +Version: 2006o %define tzdata_version %{version} %define tzcode_version %{version} -Release: 2%{?dist} +Release: 1%{?dist} License: GPL Group: System Environment/Base Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz -Patch0: tzdata-2006m-brazil.patch BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -29,7 +28,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig -%patch0 -p1 %build make @@ -54,6 +52,10 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Thu Nov 9 2006 Petr Machata - 2006o-1 +- Cuba has ended its three years of permanent DST. +- Updates in historical timestamps for Chile. + * Tue Oct 10 2006 Petr Machata - 2006m-2 - Proposed upstream patch (#210058) - Jordan will switch to winter time on October 27, not September 29 From 85b9646f1890e1a5da2f79a625111da6bac39ae7 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 22 Nov 2006 20:18:48 +0000 Subject: [PATCH 042/280] - Patch for Western Australia DST trial Resolves: bz 216692 Resolves: bz 216691 Resolves: bz 216384 --- tzdata.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 2a16edb..2df4d6f 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,12 +3,13 @@ Name: tzdata Version: 2006o %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +Patch0: tzdata-2006o-wa.patch BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -28,6 +29,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig +%patch0 -p1 %build make @@ -52,6 +54,9 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Wed Nov 22 2006 Petr Machata - 2006o-2 +- Patch for Western Australia DST trial + * Thu Nov 9 2006 Petr Machata - 2006o-1 - Cuba has ended its three years of permanent DST. - Updates in historical timestamps for Chile. From 1fc327f01148a768f1009963f993b45b841c0424 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 29 Nov 2006 09:50:56 +0000 Subject: [PATCH 043/280] - Upstream 2006p - Official version of Western Australia DST trial changes - Latitude/longitude changes for Europe/Jersey and Europe/Podgorica --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 11 +++++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 475cde6..94763f1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2006o.tar.gz -tzdata2006o.tar.gz +tzcode2006p.tar.gz +tzdata2006p.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index 2cf5311..f9d7b7e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -352ca2fc0fffc02fa38c7ab0ceeb3b34 tzcode2006o.tar.gz -1dc760409e9a7e6a2f29152d26503c5d tzdata2006o.tar.gz +a1665dde14d48353563cd98cc196df4a tzcode2006p.tar.gz +cbdf758536710f444de1467fdc19594f tzdata2006p.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 2df4d6f..8f57603 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,15 +1,14 @@ Summary: Timezone data Name: tzdata -Version: 2006o +Version: 2006p %define tzdata_version %{version} %define tzcode_version %{version} -Release: 2%{?dist} +Release: 1%{?dist} License: GPL Group: System Environment/Base Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz -Patch0: tzdata-2006o-wa.patch BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -29,7 +28,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig -%patch0 -p1 %build make @@ -54,6 +52,11 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Wed Nov 29 2006 Petr Machata - 2006p-1 +- Upstream 2006p + - Official version of Western Australia DST trial changes + - Latitude/longitude changes for Europe/Jersey and Europe/Podgorica + * Wed Nov 22 2006 Petr Machata - 2006o-2 - Patch for Western Australia DST trial From a8ffe45ce83c93b881864176026fee6f3bbd9073 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 18 Jan 2007 13:34:09 +0000 Subject: [PATCH 044/280] - Upstream 2007a - Updates to Bahamas, they will be in sync with 2007 US DST change - New zone Australia/Eucla - Africa/Asmera renamed to Africa/Asmara, link created - Atlantic/Faeroe renamed to Atlantic/Faroe, link created - Packaging - Adding BuildRequires: glibc-common >= 2.5.90-7 to build tzdata with extended 64-bit format necessary for dates beyond 2037 --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 15 +++++++++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 94763f1..a544375 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2006p.tar.gz -tzdata2006p.tar.gz +tzcode2007a.tar.gz +tzdata2007a.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index f9d7b7e..21f8c88 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -a1665dde14d48353563cd98cc196df4a tzcode2006p.tar.gz -cbdf758536710f444de1467fdc19594f tzdata2006p.tar.gz +9162d8d447eec31f60d0602edd17e123 tzcode2007a.tar.gz +5ba3a8c3581a0ef962179fba1328f3cb tzdata2007a.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 8f57603..0112bf9 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2006p +Version: 2007a %define tzdata_version %{version} %define tzcode_version %{version} Release: 1%{?dist} @@ -9,10 +9,11 @@ Group: System Environment/Base Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gawk, glibc, glibc-common, perl +BuildRequires: glibc-common >= 2.5.90-7 Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch -Buildroot: %{_tmppath}/%{name}-root %description This package contains data files with rules for various timezones around @@ -52,6 +53,16 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Thu Jan 18 2007 Petr Machata - 2007a-1 +- Upstream 2007a + - Updates to Bahamas, they will be in sync with 2007 US DST change + - New zone Australia/Eucla + - Africa/Asmera renamed to Africa/Asmara, link created + - Atlantic/Faeroe renamed to Atlantic/Faroe, link created +- Packaging + - Adding BuildRequires: glibc-common >= 2.5.90-7 to build tzdata + with extended 64-bit format necessary for dates beyond 2037 + * Wed Nov 29 2006 Petr Machata - 2006p-1 - Upstream 2006p - Official version of Western Australia DST trial changes From 2ee243f4a523dc31f44ebede2919fe0265207c89 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 7 Feb 2007 19:47:13 +0000 Subject: [PATCH 045/280] - tidy up the specfile per rpmlint comments --- tzdata.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 0112bf9..67b19bc 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,14 +3,15 @@ Name: tzdata Version: 2007a %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base +URL: ftp://elsie.nci.nih.gov/pub/ Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gawk, glibc, glibc-common, perl +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gawk, glibc, perl BuildRequires: glibc-common >= 2.5.90-7 Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -20,14 +21,13 @@ This package contains data files with rules for various timezones around the world. %prep -%setup -n tzdata +%setup -q -n tzdata mkdir tzdata%{tzdata_version} tar xzf %{SOURCE1} -C tzdata%{tzdata_version} mkdir tzcode%{tzcode_version} tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ - -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig %build @@ -35,6 +35,8 @@ make grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version}/tz-link.html %install +rm -fr $RPM_BUILD_ROOT +sed -i 's|@install_root@|%{buildroot}|' Makeconfig make install %check @@ -53,6 +55,9 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Wed Feb 7 2007 Petr Machata - 2007a-2 +- tidy up the specfile per rpmlint comments + * Thu Jan 18 2007 Petr Machata - 2007a-1 - Upstream 2007a - Updates to Bahamas, they will be in sync with 2007 US DST change @@ -215,7 +220,7 @@ rm -rf %{buildroot} * Thu Mar 17 2005 Jakub Jelinek 2005g-2 - 2005g - fixes for Uruguay -- include README and Theory from tzcode tarball in %{_docdir}; +- include README and Theory from tzcode tarball in %%{_docdir}; Theory includes a good summary of how the timezone data files are supposed to be named From 6e4d1b7fe06e1d953a2f84bdb699018fb2da7d9c Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 26 Feb 2007 15:04:40 +0000 Subject: [PATCH 046/280] - Upstream 2007c - Pulaski County, Indiana, switched back to eastern time. - Turkey switches at 01:00 standard time, not at 01:00 UTC. - Upstream 2007b - Changes to the commentary in "leapseconds". --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 11 +++++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index a544375..2715f07 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2007a.tar.gz -tzdata2007a.tar.gz +tzcode2007c.tar.gz +tzdata2007c.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index 21f8c88..62f6ca8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -9162d8d447eec31f60d0602edd17e123 tzcode2007a.tar.gz -5ba3a8c3581a0ef962179fba1328f3cb tzdata2007a.tar.gz +e4913aa2edaf097b0627ead6b45fbedc tzcode2007c.tar.gz +730d744ac691e950066f8b6bd17b02d0 tzdata2007c.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 67b19bc..1e95872 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2007a +Version: 2007c %define tzdata_version %{version} %define tzcode_version %{version} -Release: 2%{?dist} +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -55,6 +55,13 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Mon Feb 26 2007 Petr Machata - 2007c-1 +- Upstream 2007c + - Pulaski County, Indiana, switched back to eastern time. + - Turkey switches at 01:00 standard time, not at 01:00 UTC. +- Upstream 2007b + - Changes to the commentary in "leapseconds". + * Wed Feb 7 2007 Petr Machata - 2007a-2 - tidy up the specfile per rpmlint comments From a77fc821a4c5e9afe24f18f46d9aa75f7b48f267 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 21 Mar 2007 13:17:38 +0000 Subject: [PATCH 047/280] - Upstream 2007d - Mongolia has abolished DST. - Turkey will use EU rules this year, changing at 01:00 UTC rather than 01:00 standard time. - Cuba observed DST starting Sunday. - Resolute, Nunavut switched from Central to Eastern time last November. --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 11 ++++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2715f07..6bb2e9e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2007c.tar.gz -tzdata2007c.tar.gz +tzcode2007d.tar.gz +tzdata2007d.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index 62f6ca8..8e6a0e2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e4913aa2edaf097b0627ead6b45fbedc tzcode2007c.tar.gz -730d744ac691e950066f8b6bd17b02d0 tzdata2007c.tar.gz +f63d242016ce0da0bafc0867e2824ad9 tzcode2007d.tar.gz +05ba08b08c773cd26b74a94205bf397f tzdata2007d.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 1e95872..7137782 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2007c +Version: 2007d %define tzdata_version %{version} %define tzcode_version %{version} Release: 1%{?dist} @@ -55,6 +55,15 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Wed Mar 21 2007 Petr Machata - 2007d-1 +- Upstream 2007d + - Mongolia has abolished DST. + - Turkey will use EU rules this year, changing at 01:00 UTC rather + than 01:00 standard time. + - Cuba observed DST starting Sunday. + - Resolute, Nunavut switched from Central to Eastern time last + November. + * Mon Feb 26 2007 Petr Machata - 2007c-1 - Upstream 2007c - Pulaski County, Indiana, switched back to eastern time. From 01ed0ae84774395752d9fc1cdbfa90d6c708f182 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 3 Apr 2007 15:18:40 +0000 Subject: [PATCH 048/280] Honduras & Syria made their minds. --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6bb2e9e..a0293b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2007d.tar.gz -tzdata2007d.tar.gz +tzcode2007e.tar.gz +tzdata2007e.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index 8e6a0e2..c6f8148 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -f63d242016ce0da0bafc0867e2824ad9 tzcode2007d.tar.gz -05ba08b08c773cd26b74a94205bf397f tzdata2007d.tar.gz +4ac16fb9de55c6e8e4c86b4e3613fbcf tzcode2007e.tar.gz +b74e5f71714e5222340f1fb30da30a76 tzdata2007e.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 7137782..68a37e2 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2007d +Version: 2007e %define tzdata_version %{version} %define tzcode_version %{version} Release: 1%{?dist} @@ -55,6 +55,11 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Tue Apr 3 2007 Petr Machata - 2007e-1 +- Upstream 2007e + - Syria switched to summer time at Mar/29. + - Honduras will not enter DST this year. + * Wed Mar 21 2007 Petr Machata - 2007d-1 - Upstream 2007d - Mongolia has abolished DST. From 4e274618ee3af1e5a17ec3a6f1d431dc6ca10592 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 9 May 2007 15:40:42 +0000 Subject: [PATCH 049/280] - Upstream 2007f - New Zealand is extending DST, starting later this year. - Haiti no longer observes DST. - The Turks and Caicos switch at 02:00, not at 00:00, and have adopted US DST rules. --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 9 ++++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index a0293b2..1a4cf3d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2007e.tar.gz -tzdata2007e.tar.gz +tzcode2007f.tar.gz +tzdata2007f.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index c6f8148..3c5bf08 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -4ac16fb9de55c6e8e4c86b4e3613fbcf tzcode2007e.tar.gz -b74e5f71714e5222340f1fb30da30a76 tzdata2007e.tar.gz +fdfa8b941827a33e7a43aaf039ea9b67 tzcode2007f.tar.gz +799ca289ee9e2f22ce6e3f9fb9c5f847 tzdata2007f.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 68a37e2..03885be 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2007e +Version: 2007f %define tzdata_version %{version} %define tzcode_version %{version} Release: 1%{?dist} @@ -55,6 +55,13 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Wed May 9 2007 Petr Machata - 2007f-1 +- Upstream 2007f + - New Zealand is extending DST, starting later this year. + - Haiti no longer observes DST. + - The Turks and Caicos switch at 02:00, not at 00:00, and have + adopted US DST rules. + * Tue Apr 3 2007 Petr Machata - 2007e-1 - Upstream 2007e - Syria switched to summer time at Mar/29. From 193e2bd28e003ec9218b609d78ee10af42bb7c65 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 16 Aug 2007 11:30:27 +0000 Subject: [PATCH 050/280] - Fix licensing tag. --- tzdata.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 03885be..6ce70d3 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,8 +3,8 @@ Name: tzdata Version: 2007f %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: Public Domain, LGPL Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ Source0: tzdata-base-0.tar.bz2 @@ -55,6 +55,9 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Thu Aug 16 2007 Petr Machata - 2007f-2 +- Fix licensing tag. + * Wed May 9 2007 Petr Machata - 2007f-1 - Upstream 2007f - New Zealand is extending DST, starting later this year. From 77fbd199197e9e0aa45c272c9021cc33ad6b1726 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 16 Aug 2007 12:08:27 +0000 Subject: [PATCH 051/280] - Fix licensing tag even more. --- tzdata.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 6ce70d3..4b95d03 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -4,7 +4,7 @@ Version: 2007f %define tzdata_version %{version} %define tzcode_version %{version} Release: 2%{?dist} -License: Public Domain, LGPL +License: Public Domain, LGPLv2+ Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ Source0: tzdata-base-0.tar.bz2 From 49aba38bda7bd7316aa59dd77e4f9f62601b158e Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 22 Aug 2007 16:06:54 +0000 Subject: [PATCH 052/280] - Upstream 2007g - Egypt switches the September 7, not September 28 - Daviess, Dubous, Knox, Martin, and Pike Counties, Indiana, switch from central to eastern time in November - South Australia, Tasmania, Victoria, New South Wales and Lord Howe Island are changing their DST rules effective next year - Sync several Antarctic station's rules with the New Zealand - leapseconds contain changes from the most recent IERS bulletin --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 14 +++++++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1a4cf3d..d29b8fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -tzcode2007f.tar.gz -tzdata2007f.tar.gz +tzcode2007g.tar.gz +tzdata2007g.tar.gz tzdata-base-0.tar.bz2 diff --git a/sources b/sources index 3c5bf08..8934db3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -fdfa8b941827a33e7a43aaf039ea9b67 tzcode2007f.tar.gz -799ca289ee9e2f22ce6e3f9fb9c5f847 tzdata2007f.tar.gz +a5da1f7650c541fa61f9ddd0c10b5332 tzcode2007g.tar.gz +04152531a69c07b6cb08bacfd425aae1 tzdata2007g.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 4b95d03..01ae03c 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2007f +Version: 2007g %define tzdata_version %{version} %define tzcode_version %{version} -Release: 2%{?dist} +Release: 1%{?dist} License: Public Domain, LGPLv2+ Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -55,8 +55,16 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/tz-link.html %changelog -* Thu Aug 16 2007 Petr Machata - 2007f-2 +* Wed Aug 22 2007 Petr Machata - 2007g-1 - Fix licensing tag. +- Upstream 2007g + - Egypt switches the September 7, not September 28 + - Daviess, Dubous, Knox, Martin, and Pike Counties, Indiana, switch + from central to eastern time in November + - South Australia, Tasmania, Victoria, New South Wales and Lord Howe + Island are changing their DST rules effective next year + - Sync several Antarctic station's rules with the New Zealand + - leapseconds contain changes from the most recent IERS bulletin * Wed May 9 2007 Petr Machata - 2007f-1 - Upstream 2007f From 151b4cc4cfcd9ab8e36ed784fd7df831d193e210 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 25 Sep 2007 11:36:06 +0000 Subject: [PATCH 053/280] - Add support for building java's zoneinfo files in new tzdata-java RPM. --- javazic-fixup.patch | 34 +++++++++++++++++++++++++++++ tzdata.spec | 53 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 javazic-fixup.patch diff --git a/javazic-fixup.patch b/javazic-fixup.patch new file mode 100644 index 0000000..8b19ef4 --- /dev/null +++ b/javazic-fixup.patch @@ -0,0 +1,34 @@ +--- sun/util/calendar/LocalGregorianCalendar.java.keiths 2007-09-07 14:48:19.000000000 -0700 ++++ sun/util/calendar/LocalGregorianCalendar.java 2007-09-07 14:52:58.000000000 -0700 +@@ -120,8 +120,7 @@ public class LocalGregorianCalendar exte + static LocalGregorianCalendar getLocalGregorianCalendar(String name) { + Properties calendarProps = null; + try { +- String homeDir = (String) AccessController.doPrivileged( +- new sun.security.action.GetPropertyAction("java.home")); ++ String homeDir = (String) System.getProperty("java.home"); + final String fname = homeDir + File.separator + "lib" + File.separator + + "calendars.properties"; + calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() { +--- sun/util/calendar/ZoneInfoFile.java.keiths 2007-09-07 14:54:58.000000000 -0700 ++++ sun/util/calendar/ZoneInfoFile.java 2007-09-07 14:55:36.000000000 -0700 +@@ -1021,8 +1021,7 @@ public class ZoneInfoFile { + byte[] buffer = null; + + try { +- String zi_dir = (String) AccessController.doPrivileged( +- new sun.security.action.GetPropertyAction("user.zoneinfo.dir")); ++ String zi_dir = (String) System.getProperty("user.zoneinfo.dir"); + File dir = null; + if (zi_dir != null) + dir = new File(zi_dir); +@@ -1035,8 +1034,7 @@ public class ZoneInfoFile { + } + + if (dir == null) { +- String homeDir = (String) AccessController.doPrivileged( +- new sun.security.action.GetPropertyAction("java.home")); ++ String homeDir = (String) System.getProperty("java.home"); + zi_dir = homeDir + File.separator + "lib" + File.separator + + "zi"; + } diff --git a/tzdata.spec b/tzdata.spec index 01ae03c..301009a 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2007g %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain, LGPLv2+ Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -20,6 +20,18 @@ BuildArchitectures: noarch This package contains data files with rules for various timezones around the world. +%package java +Summary: Timzeone data for Java +Group: System Environment/Base +Source3: javazic.tar.gz +BuildArchitectures: noarch +BuildRequires: java-devel +Patch0: javazic-fixup.patch + +%description java +This package contains timezone information for use by Java runtimes. + + %prep %setup -q -n tzdata mkdir tzdata%{tzdata_version} @@ -30,15 +42,46 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig +mkdir javazic +tar zxf %{SOURCE3} -C javazic +pushd javazic +%patch0 + +# Hack alert! sun.tools may be defined and installed in the +# VM. In order to guarantee that we are using IcedTea/OpenJDK +# for creating the zoneinfo files, rebase all the packages +# from "sun." to "rht.". Unfortunately, gcj does not support +# any of the -Xclasspath options, so we must go this route +# to ensure the greatest compatibility. +mv sun rht +for f in `find . -name '*.java'`; do + sed -i -e 's:sun\.tools\.:rht.tools.:g'\ + -e 's:sun\.util\.:rht.util.:g' $f +done +popd + %build make grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version}/tz-link.html +pushd javazic +javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java` +popd +pushd tzdata%{tzcode_version} +java -classpath ../javazic/ rht.tools.javazic.Main -V %{version} \ + -d ../zoneinfo/java \ + africa antarctica asia australasia europe northamerica pacificnew \ + southamerica backward etcetera solar87 solar88 solar89 systemv \ + ../javazic/tzdata_jdk/gmt ../javazic/tzdata_jdk/jdk11_backward +popd + %install rm -fr $RPM_BUILD_ROOT sed -i 's|@install_root@|%{buildroot}|' Makeconfig make install +cp -pr zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi + %check echo ====================TESTING========================= make check @@ -54,7 +97,15 @@ rm -rf %{buildroot} %doc tzcode%{tzcode_version}/Theory %doc tzcode%{tzcode_version}/tz-link.html +%files java +%defattr(-,root,root) +%{_datadir}/javazi + %changelog +* Thu Sep 25 2007 Keith Seitz - 2007g-2 +- Add support for building java's zoneinfo files in new + tzdata-java RPM. + * Wed Aug 22 2007 Petr Machata - 2007g-1 - Fix licensing tag. - Upstream 2007g From 3a9ba3e17a9ab2a6a367d21a9a5d787e8f787c88 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 26 Sep 2007 11:38:04 +0000 Subject: [PATCH 054/280] Add javazic source. --- .cvsignore | 3 ++- sources | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index d29b8fb..b8e503c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ -tzcode2007g.tar.gz tzdata2007g.tar.gz +tzcode2007g.tar.gz tzdata-base-0.tar.bz2 +javazic.tar.gz diff --git a/sources b/sources index 8934db3..3c537f7 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ -a5da1f7650c541fa61f9ddd0c10b5332 tzcode2007g.tar.gz 04152531a69c07b6cb08bacfd425aae1 tzdata2007g.tar.gz +a5da1f7650c541fa61f9ddd0c10b5332 tzcode2007g.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 +6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz From 989053335da4135fff7c10d76e929ffd485149a2 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 1 Oct 2007 15:45:33 +0000 Subject: [PATCH 055/280] - Upstream 2007h - Brazil will observe DST from 2007-10-14 to 2008-02-17 - Egypt and Gaza switched earlier than we expected - Iran will resume DST next year - Venezuela is scheduled to change TZ to -4:30 on January 1 --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 11 +++++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index b8e503c..6b22321 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -tzdata2007g.tar.gz -tzcode2007g.tar.gz tzdata-base-0.tar.bz2 javazic.tar.gz +tzdata2007h.tar.gz +tzcode2007h.tar.gz diff --git a/sources b/sources index 3c537f7..4362eba 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -04152531a69c07b6cb08bacfd425aae1 tzdata2007g.tar.gz -a5da1f7650c541fa61f9ddd0c10b5332 tzcode2007g.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz +da8b4fb3abd4f1403b0bd2a4675a91ab tzdata2007h.tar.gz +e3d9b770e2a74bcddb6aac57f699c961 tzcode2007h.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 301009a..3b88e23 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2007g +Version: 2007h %define tzdata_version %{version} %define tzcode_version %{version} -Release: 2%{?dist} +Release: 1%{?dist} License: Public Domain, LGPLv2+ Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -102,6 +102,13 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Oct 1 2007 Petr Machata - 2007h-1 +- Upstream 2007h + - Brazil will observe DST from 2007-10-14 to 2008-02-17 + - Egypt and Gaza switched earlier than we expected + - Iran will resume DST next year + - Venezuela is scheduled to change TZ to -4:30 on January 1 + * Thu Sep 25 2007 Keith Seitz - 2007g-2 - Add support for building java's zoneinfo files in new tzdata-java RPM. From 4e41286c24631ff35872038b537fed3628fdc04f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 19:29:08 +0000 Subject: [PATCH 056/280] makefile update to properly grab makefile.common --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 45736a0..500754a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,21 @@ # Makefile for source rpm: tzdata -# $Id$ +# $Id: Makefile,v 1.1 2004/09/09 13:40:39 cvsdist Exp $ NAME := tzdata SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From 9dc54c11df4a5c49d57cbe18266cad9b32ed5ebb Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 5 Nov 2007 12:32:02 +0000 Subject: [PATCH 057/280] - Upstream 2007i - Syria DST will take place at Midnight between Thursday and Friday. - Cuba will end DST on the last Sunday of October. --- .cvsignore | 2 +- sources | 2 +- tzdata.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6b22321..5218d23 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ tzdata-base-0.tar.bz2 javazic.tar.gz -tzdata2007h.tar.gz tzcode2007h.tar.gz +tzdata2007i.tar.gz diff --git a/sources b/sources index 4362eba..f3778f8 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz -da8b4fb3abd4f1403b0bd2a4675a91ab tzdata2007h.tar.gz e3d9b770e2a74bcddb6aac57f699c961 tzcode2007h.tar.gz +bfe68c92dbe3726676063bdb14931b8b tzdata2007i.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 3b88e23..7cd0599 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2007h +Version: 2007i %define tzdata_version %{version} -%define tzcode_version %{version} +%define tzcode_version 2007h Release: 1%{?dist} License: Public Domain, LGPLv2+ Group: System Environment/Base @@ -102,6 +102,11 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Nov 5 2007 Petr Machata - 2007i-1 +- Upstream 2007i + - Syria DST will take place at Midnight between Thursday and Friday. + - Cuba will end DST on the last Sunday of October. + * Mon Oct 1 2007 Petr Machata - 2007h-1 - Upstream 2007h - Brazil will observe DST from 2007-10-14 to 2008-02-17 From cddb86d790dc548bcfb3e76493bec6d4004f6525 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 5 Nov 2007 12:43:17 +0000 Subject: [PATCH 058/280] Packaging issue. --- tzdata.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 7cd0599..77df4d1 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -67,7 +67,7 @@ grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version} pushd javazic javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java` popd -pushd tzdata%{tzcode_version} +pushd tzdata%{tzdata_version} java -classpath ../javazic/ rht.tools.javazic.Main -V %{version} \ -d ../zoneinfo/java \ africa antarctica asia australasia europe northamerica pacificnew \ From 9a2f5a6b5fff3715fc933b991c9121b436a70c3d Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 5 Nov 2007 14:15:32 +0000 Subject: [PATCH 059/280] - Fix test case for Asia/Tokyo --- sources | 2 +- tzdata.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sources b/sources index f3778f8..5aaf6d9 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e3d9b770e2a74bcddb6aac57f699c961 tzcode2007h.tar.gz bfe68c92dbe3726676063bdb14931b8b tzdata2007i.tar.gz +f42f560ab99b9738056b30e4cff9746a tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 77df4d1..31dadbf 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -106,6 +106,7 @@ rm -rf %{buildroot} - Upstream 2007i - Syria DST will take place at Midnight between Thursday and Friday. - Cuba will end DST on the last Sunday of October. +- Fix test case for Asia/Tokyo * Mon Oct 1 2007 Petr Machata - 2007h-1 - Upstream 2007h From 868f5c8202cec6dc1de02eab02e0357547810948 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 5 Nov 2007 16:43:38 +0000 Subject: [PATCH 060/280] - Update tst-timezone.c from glibc CVS --- sources | 2 +- tzdata.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5aaf6d9..908ea82 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e3d9b770e2a74bcddb6aac57f699c961 tzcode2007h.tar.gz bfe68c92dbe3726676063bdb14931b8b tzdata2007i.tar.gz -f42f560ab99b9738056b30e4cff9746a tzdata-base-0.tar.bz2 +e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 diff --git a/tzdata.spec b/tzdata.spec index 31dadbf..8288160 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -106,7 +106,7 @@ rm -rf %{buildroot} - Upstream 2007i - Syria DST will take place at Midnight between Thursday and Friday. - Cuba will end DST on the last Sunday of October. -- Fix test case for Asia/Tokyo +- Update tst-timezone.c from glibc CVS * Mon Oct 1 2007 Petr Machata - 2007h-1 - Upstream 2007h From aef8a023398294a177dc337094c6871f1f57998a Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 4 Dec 2007 09:52:45 +0000 Subject: [PATCH 061/280] - Upstream 2007j - New links America/St_Barthelemy and America/Marigot - Venezuela is changing their clocks on December 9 at 03:00 --- .cvsignore | 4 ++-- sources | 4 ++-- tzdata.spec | 9 +++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5218d23..baf4567 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ tzdata-base-0.tar.bz2 javazic.tar.gz -tzcode2007h.tar.gz -tzdata2007i.tar.gz +tzcode2007j.tar.gz +tzdata2007j.tar.gz diff --git a/sources b/sources index 908ea82..c75b957 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz -e3d9b770e2a74bcddb6aac57f699c961 tzcode2007h.tar.gz -bfe68c92dbe3726676063bdb14931b8b tzdata2007i.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 +02f71a69ea46f5217dc54b987720b820 tzcode2007j.tar.gz +cca2880ec98ad43a0a6ba0bc9beb81c1 tzdata2007j.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 8288160..ade62b5 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2007i +Version: 2007j %define tzdata_version %{version} -%define tzcode_version 2007h +%define tzcode_version %{version} Release: 1%{?dist} License: Public Domain, LGPLv2+ Group: System Environment/Base @@ -102,6 +102,11 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Tue Dec 4 2007 Petr Machata - 2007j-1 +- Upstream 2007j + - New links America/St_Barthelemy and America/Marigot + - Venezuela is changing their clocks on December 9 at 03:00 + * Mon Nov 5 2007 Petr Machata - 2007i-1 - Upstream 2007i - Syria DST will take place at Midnight between Thursday and Friday. From 8a8f639307b37bc626d186eb22ac6b106159400f Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 3 Jan 2008 13:11:31 +0000 Subject: [PATCH 062/280] - Upstream 2007k - Argentina readopted the daylight saving time --- .cvsignore | 2 ++ sources | 4 ++-- tzdata.spec | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index baf4567..74f3876 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,5 @@ tzdata-base-0.tar.bz2 javazic.tar.gz tzcode2007j.tar.gz tzdata2007j.tar.gz +tzdata2007k.tar.gz +tzcode2007k.tar.gz diff --git a/sources b/sources index c75b957..f490f4f 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -02f71a69ea46f5217dc54b987720b820 tzcode2007j.tar.gz -cca2880ec98ad43a0a6ba0bc9beb81c1 tzdata2007j.tar.gz +595b3b197174fa0c2dd654c52969fb2a tzdata2007k.tar.gz +1f1de10e168b78681756cc6411ea8145 tzcode2007k.tar.gz diff --git a/tzdata.spec b/tzdata.spec index ade62b5..ac182dd 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2007j +Version: 2007k %define tzdata_version %{version} %define tzcode_version %{version} Release: 1%{?dist} @@ -102,6 +102,10 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Thu Jan 3 2008 Petr Machata - 2007k-1 +- Upstream 2007k + - Argentina readopted the daylight saving time + * Tue Dec 4 2007 Petr Machata - 2007j-1 - Upstream 2007j - New links America/St_Barthelemy and America/Marigot From f5f4127e39006a18fcf66db2265b4e97886730c4 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 4 Jan 2008 14:25:03 +0000 Subject: [PATCH 063/280] Comments, cleanups per merge review. --- tzdata.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index ac182dd..2f16f54 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -4,14 +4,22 @@ Version: 2007k %define tzdata_version %{version} %define tzcode_version %{version} Release: 1%{?dist} -License: Public Domain, LGPLv2+ +License: Public Domain and LGPLv2+ Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ + +# The tzdata-base-0.tar.bz2 is a simple building infrastructure and +# test suite. It is occasionally updated from glibc sources, and as +# such is under LGPLv2+. None of this ever gets to be part of final +# zoneinfo files. Source0: tzdata-base-0.tar.bz2 +# These are official upstream, in Public Domain. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl +BuildRequires: java-devel BuildRequires: glibc-common >= 2.5.90-7 Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -24,8 +32,6 @@ the world. Summary: Timzeone data for Java Group: System Environment/Base Source3: javazic.tar.gz -BuildArchitectures: noarch -BuildRequires: java-devel Patch0: javazic-fixup.patch %description java From 478eb2701ed6765e9dbb67ffe0c68b6302cf68d2 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 7 Jan 2008 15:32:59 +0000 Subject: [PATCH 064/280] Commentary changes, update license. --- tzdata.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 2f16f54..ef74638 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -4,16 +4,16 @@ Version: 2007k %define tzdata_version %{version} %define tzcode_version %{version} Release: 1%{?dist} -License: Public Domain and LGPLv2+ +License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ # The tzdata-base-0.tar.bz2 is a simple building infrastructure and # test suite. It is occasionally updated from glibc sources, and as -# such is under LGPLv2+. None of this ever gets to be part of final -# zoneinfo files. +# such is under LGPLv2+, but none of this ever gets to be part of +# final zoneinfo files. Source0: tzdata-base-0.tar.bz2 -# These are official upstream, in Public Domain. +# These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz From 696a370b69a0b8b95c933536fd7ae87751c2b90b Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 5 Mar 2008 15:55:13 +0000 Subject: [PATCH 065/280] Add Chile patches. --- tzdata-2007k-chile.patch | 24 ++++++++++++++++++++++++ tzdata.spec | 8 +++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 tzdata-2007k-chile.patch diff --git a/tzdata-2007k-chile.patch b/tzdata-2007k-chile.patch new file mode 100644 index 0000000..ef69f96 --- /dev/null +++ b/tzdata-2007k-chile.patch @@ -0,0 +1,24 @@ +diff -urp tzdata/tzdata2007k/southamerica tzdata-pm/tzdata2007k/southamerica +--- tzdata/tzdata2007k/southamerica 2007-12-31 16:24:53.000000000 +0100 ++++ tzdata-pm/tzdata2007k/southamerica 2008-03-04 21:34:35.000000000 +0100 +@@ -790,6 +790,7 @@ Rule Chile 1998 only - Sep 27 4:00u 1:00 + Rule Chile 1999 only - Apr 4 3:00u 0 - + Rule Chile 1999 max - Oct Sun>=9 4:00u 1:00 S +-Rule Chile 2000 max - Mar Sun>=9 3:00u 0 - ++Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - ++Rule Chile 2008 max - Mar Sun>=29 3:00u 0 - + # IATA SSIM anomalies: (1992-02) says 1992-03-14; + # (1996-09) says 1998-03-08. Ignore these. + # Zone NAME GMTOFF RULES FORMAT [UNTIL] +--- tzdata-pm/tzdata2007k/antarctica 2007-11-19 23:33:32.000000000 +0100 ++++ tzdata/tzdata2007k/antarctica 2008-03-04 22:23:38.000000000 +0100 +@@ -53,7 +53,8 @@ + Rule ChileAQ 1998 only - Sep 27 4:00u 1:00 S + Rule ChileAQ 1999 only - Apr 4 3:00u 0 - + Rule ChileAQ 1999 max - Oct Sun>=9 4:00u 1:00 S +-Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 - ++Rule ChileAQ 2000 2007 - Mar Sun>=9 3:00u 0 - ++Rule ChileAQ 2008 max - Mar Sun>=29 3:00u 0 - + + + # Argentina - year-round bases diff --git a/tzdata.spec b/tzdata.spec index ef74638..8056962 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2007k %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -16,6 +16,7 @@ Source0: tzdata-base-0.tar.bz2 # These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +Patch1: tzdata-2007k-chile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -47,6 +48,7 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig +%patch1 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -108,6 +110,10 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Tue Mar 4 2008 Petr Machata - 2007k-2 +- Chile moves DST to 29/Mar +- Related: #435959 + * Thu Jan 3 2008 Petr Machata - 2007k-1 - Upstream 2007k - Argentina readopted the daylight saving time From d1e55e4682455f15107d303ebb4e6f1df756563c Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 26 Mar 2008 13:31:04 +0000 Subject: [PATCH 066/280] - Upstream 2008b - DST changes for Syria, Cuba; Iraq abandons DST - Saigon zone renamed Ho_Chi_Minh; backward link provided - Add America/Argentina/San_Luis information --- .cvsignore | 2 ++ sources | 4 ++-- tzdata-2007k-chile.patch | 24 ------------------------ tzdata.spec | 21 ++++++++++++--------- 4 files changed, 16 insertions(+), 35 deletions(-) delete mode 100644 tzdata-2007k-chile.patch diff --git a/.cvsignore b/.cvsignore index 74f3876..2f2daea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -4,3 +4,5 @@ tzcode2007j.tar.gz tzdata2007j.tar.gz tzdata2007k.tar.gz tzcode2007k.tar.gz +tzcode2008a.tar.gz +tzdata2008b.tar.gz diff --git a/sources b/sources index f490f4f..4c7e8e1 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -595b3b197174fa0c2dd654c52969fb2a tzdata2007k.tar.gz -1f1de10e168b78681756cc6411ea8145 tzcode2007k.tar.gz +4a04c12a8ec50b0a8cfc9ebce96b07d3 tzcode2008a.tar.gz +dbeb9a327bbff77ab4078488b8c5323a tzdata2008b.tar.gz diff --git a/tzdata-2007k-chile.patch b/tzdata-2007k-chile.patch deleted file mode 100644 index ef69f96..0000000 --- a/tzdata-2007k-chile.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urp tzdata/tzdata2007k/southamerica tzdata-pm/tzdata2007k/southamerica ---- tzdata/tzdata2007k/southamerica 2007-12-31 16:24:53.000000000 +0100 -+++ tzdata-pm/tzdata2007k/southamerica 2008-03-04 21:34:35.000000000 +0100 -@@ -790,6 +790,7 @@ Rule Chile 1998 only - Sep 27 4:00u 1:00 - Rule Chile 1999 only - Apr 4 3:00u 0 - - Rule Chile 1999 max - Oct Sun>=9 4:00u 1:00 S --Rule Chile 2000 max - Mar Sun>=9 3:00u 0 - -+Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - -+Rule Chile 2008 max - Mar Sun>=29 3:00u 0 - - # IATA SSIM anomalies: (1992-02) says 1992-03-14; - # (1996-09) says 1998-03-08. Ignore these. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] ---- tzdata-pm/tzdata2007k/antarctica 2007-11-19 23:33:32.000000000 +0100 -+++ tzdata/tzdata2007k/antarctica 2008-03-04 22:23:38.000000000 +0100 -@@ -53,7 +53,8 @@ - Rule ChileAQ 1998 only - Sep 27 4:00u 1:00 S - Rule ChileAQ 1999 only - Apr 4 3:00u 0 - - Rule ChileAQ 1999 max - Oct Sun>=9 4:00u 1:00 S --Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 - -+Rule ChileAQ 2000 2007 - Mar Sun>=9 3:00u 0 - -+Rule ChileAQ 2008 max - Mar Sun>=29 3:00u 0 - - - - # Argentina - year-round bases diff --git a/tzdata.spec b/tzdata.spec index 8056962..0b3fa2e 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2007k +Version: 2008b %define tzdata_version %{version} -%define tzcode_version %{version} -Release: 2%{?dist} +%define tzcode_version 2008a +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -16,7 +16,6 @@ Source0: tzdata-base-0.tar.bz2 # These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz -Patch1: tzdata-2007k-chile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -48,7 +47,6 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig -%patch1 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -62,10 +60,9 @@ pushd javazic # any of the -Xclasspath options, so we must go this route # to ensure the greatest compatibility. mv sun rht -for f in `find . -name '*.java'`; do - sed -i -e 's:sun\.tools\.:rht.tools.:g'\ - -e 's:sun\.util\.:rht.util.:g' $f -done +find . -type f -name '*.java' -print0 \ + | xargs -0 -- sed -i -e 's:sun\.tools\.:rht.tools.:g' \ + -e 's:sun\.util\.:rht.util.:g' popd %build @@ -110,6 +107,12 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Wed Mar 26 2008 Petr Machata - 2008b-1 +- Upstream 2008b + - DST changes for Syria, Cuba; Iraq abandons DST + - Saigon zone renamed Ho_Chi_Minh; backward link provided + - Add America/Argentina/San_Luis information + * Tue Mar 4 2008 Petr Machata - 2007k-2 - Chile moves DST to 29/Mar - Related: #435959 From f6afebba05b23e050cf30c385f0a48e81b5b56d1 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 23 May 2008 17:07:27 +0000 Subject: [PATCH 067/280] - Pakistan introduces DST --- tzdata-karachi.patch | 13 +++++++++++++ tzdata.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 tzdata-karachi.patch diff --git a/tzdata-karachi.patch b/tzdata-karachi.patch new file mode 100644 index 0000000..8524404 --- /dev/null +++ b/tzdata-karachi.patch @@ -0,0 +1,13 @@ +diff -urp tzdata/tzdata2008b/asia tzdata-pm/tzdata2008b/asia +--- tzdata/tzdata2008b/asia 2008-03-24 13:30:58.000000000 +0100 ++++ tzdata-pm/tzdata2008b/asia 2008-05-19 13:00:50.000000000 +0200 +@@ -1465,6 +1465,8 @@ Zone Asia/Muscat 3:54:20 - LMT 1920 + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S + Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 - ++Rule Pakistan 2008 only - Jun 1 0:01 1:00 S ++Rule Pakistan 2008 only - Aug 31 0:01 0 - + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Asia/Karachi 4:28:12 - LMT 1907 + 5:30 - IST 1942 Sep +Only in tzdata-pm/tzdata2008b: asia~ diff --git a/tzdata.spec b/tzdata.spec index 0b3fa2e..47c3845 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2008b %define tzdata_version %{version} %define tzcode_version 2008a -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -16,6 +16,7 @@ Source0: tzdata-base-0.tar.bz2 # These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +Patch1: tzdata-karachi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -47,6 +48,7 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig +%patch1 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -107,6 +109,9 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Fri May 23 2008 Petr Machata - 2008b-2 +- Pakistan introduces DST + * Wed Mar 26 2008 Petr Machata - 2008b-1 - Upstream 2008b - DST changes for Syria, Cuba; Iraq abandons DST From 0a1870981bf694f93c314c6fcdfd4fc9d2179087 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 27 May 2008 15:29:42 +0000 Subject: [PATCH 068/280] - Morocco introduces DST --- tzdata-casablanca.patch | 19 +++++++++++++++++++ tzdata-karachi.patch | 1 - tzdata.spec | 7 ++++++- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 tzdata-casablanca.patch diff --git a/tzdata-casablanca.patch b/tzdata-casablanca.patch new file mode 100644 index 0000000..798a2a0 --- /dev/null +++ b/tzdata-casablanca.patch @@ -0,0 +1,19 @@ +diff -urp tzdata/tzdata2008b/africa tzdata-pm/tzdata2008b/africa +--- tzdata/tzdata2008b/africa 2008-03-24 13:30:58.000000000 +0100 ++++ tzdata-pm/tzdata2008b/africa 2008-05-26 13:38:43.000000000 +0200 +@@ -416,11 +416,13 @@ Rule Morocco 1976 only - Aug 1 0:00 0 + Rule Morocco 1977 only - Sep 28 0:00 0 - + Rule Morocco 1978 only - Jun 1 0:00 1:00 S + Rule Morocco 1978 only - Aug 4 0:00 0 - ++Rule Morocco 2008 only - Jun 1 0:00 1:00 S ++Rule Morocco 2008 only - Sep 28 0:00 0 - + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 + 0:00 Morocco WE%sT 1984 Mar 16 + 1:00 - CET 1986 +- 0:00 - WET ++ 0:00 Morocco WE%sT + # Western Sahara + Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan + -1:00 - WAT 1976 Apr 14 +Only in tzdata-pm/tzdata2008b: africa~ diff --git a/tzdata-karachi.patch b/tzdata-karachi.patch index 8524404..409ee4b 100644 --- a/tzdata-karachi.patch +++ b/tzdata-karachi.patch @@ -10,4 +10,3 @@ diff -urp tzdata/tzdata2008b/asia tzdata-pm/tzdata2008b/asia # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Karachi 4:28:12 - LMT 1907 5:30 - IST 1942 Sep -Only in tzdata-pm/tzdata2008b: asia~ diff --git a/tzdata.spec b/tzdata.spec index 47c3845..72c05e9 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2008b %define tzdata_version %{version} %define tzcode_version 2008a -Release: 2%{?dist} +Release: 3%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -17,6 +17,7 @@ Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz Patch1: tzdata-karachi.patch +Patch2: tzdata-casablanca.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -49,6 +50,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig %patch1 -p1 +%patch2 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -109,6 +111,9 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Tue May 27 2008 Petr Machata - 2008b-3 +- Morocco introduces DST + * Fri May 23 2008 Petr Machata - 2008b-2 - Pakistan introduces DST From 8b5f0833363fa377689870984f4a8dd4c1fee90c Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 30 May 2008 10:33:14 +0000 Subject: [PATCH 069/280] - Upstream 2008c - Mongolia changes zone - Pakistan DST is scheduled until Sep/1, instead of Aug/31 - Drop Morocco and Pakistan patches that are superseded by upstream - Fix a typo in Java subpackage name --- .cvsignore | 1 + sources | 2 +- tzdata.spec | 17 ++++++++++------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2f2daea..33b51fd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -6,3 +6,4 @@ tzdata2007k.tar.gz tzcode2007k.tar.gz tzcode2008a.tar.gz tzdata2008b.tar.gz +tzdata2008c.tar.gz diff --git a/sources b/sources index 4c7e8e1..fb19a36 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 4a04c12a8ec50b0a8cfc9ebce96b07d3 tzcode2008a.tar.gz -dbeb9a327bbff77ab4078488b8c5323a tzdata2008b.tar.gz +e9155acbc2a3310f4554095489214f38 tzdata2008c.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 72c05e9..8e12b57 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2008b +Version: 2008c %define tzdata_version %{version} %define tzcode_version 2008a -Release: 3%{?dist} +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -16,8 +16,6 @@ Source0: tzdata-base-0.tar.bz2 # These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz -Patch1: tzdata-karachi.patch -Patch2: tzdata-casablanca.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -31,7 +29,7 @@ This package contains data files with rules for various timezones around the world. %package java -Summary: Timzeone data for Java +Summary: Timezone data for Java Group: System Environment/Base Source3: javazic.tar.gz Patch0: javazic-fixup.patch @@ -49,8 +47,6 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig -%patch1 -p1 -%patch2 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -111,6 +107,13 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Wed May 30 2008 Petr Machata - 2008c-1 +- Upstream 2008c + - Mongolia changes zone + - Pakistan DST is scheduled until Sep/1, instead of Aug/31 +- Drop Morocco and Pakistan patches that are superseded by upstream +- Fix a typo in Java subpackage name + * Tue May 27 2008 Petr Machata - 2008b-3 - Morocco introduces DST From 237c9b0a4674dfe34b7c3bfca9dc8eaa8f03b766 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 8 Jul 2008 11:36:24 +0000 Subject: [PATCH 070/280] - Upstream 2008d - Changes for Brazil and Mauritius --- .cvsignore | 1 + sources | 2 +- tzdata.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 33b51fd..feefc69 100644 --- a/.cvsignore +++ b/.cvsignore @@ -7,3 +7,4 @@ tzcode2007k.tar.gz tzcode2008a.tar.gz tzdata2008b.tar.gz tzdata2008c.tar.gz +tzdata2008d.tar.gz diff --git a/sources b/sources index fb19a36..249934d 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 4a04c12a8ec50b0a8cfc9ebce96b07d3 tzcode2008a.tar.gz -e9155acbc2a3310f4554095489214f38 tzdata2008c.tar.gz +f89588d604a798ab0dbefb0b85f54507 tzdata2008d.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 8e12b57..0f6aed1 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2008c +Version: 2008d %define tzdata_version %{version} %define tzcode_version 2008a Release: 1%{?dist} @@ -107,6 +107,10 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Tue Jul 8 2008 Petr Machata - 2008d-1 +- Upstream 2008d + - Changes for Brazil and Mauritius + * Wed May 30 2008 Petr Machata - 2008c-1 - Upstream 2008c - Mongolia changes zone From 6184ceed7e9a42bc3e0ee465b62c8aa0bba17d85 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 12 Aug 2008 08:48:54 +0000 Subject: [PATCH 071/280] - Upstream 2008e - Changes for Mauritius - Leap second coverage for 31/Dec 2008 - Corrections of historical dates --- .cvsignore | 2 ++ sources | 4 ++-- tzdata.spec | 10 ++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index feefc69..75a117b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -8,3 +8,5 @@ tzcode2008a.tar.gz tzdata2008b.tar.gz tzdata2008c.tar.gz tzdata2008d.tar.gz +tzdata2008e.tar.gz +tzcode2008e.tar.gz diff --git a/sources b/sources index 249934d..f5d46c8 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -4a04c12a8ec50b0a8cfc9ebce96b07d3 tzcode2008a.tar.gz -f89588d604a798ab0dbefb0b85f54507 tzdata2008d.tar.gz +3b4578110a3d193ed9a00d61f27aba28 tzdata2008e.tar.gz +12ec2d85324ddcba39db1471a03f486b tzcode2008e.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 0f6aed1..aad7bf8 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2008d +Version: 2008e %define tzdata_version %{version} -%define tzcode_version 2008a +%define tzcode_version %{version} Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -107,6 +107,12 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Tue Aug 12 2008 Petr Machata - 2008e-1 +- Upstream 2008e + - Changes for Mauritius + - Leap second coverage for 31/Dec 2008 + - Corrections of historical dates + * Tue Jul 8 2008 Petr Machata - 2008d-1 - Upstream 2008d - Changes for Brazil and Mauritius From 900a3f176fadf25f996afb2fca6586804aa0d8e5 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 28 Aug 2008 17:14:02 +0000 Subject: [PATCH 072/280] - Pakistan DST is scheduled until Oct/31 - Morocco DST is scheduled until Aug/31 --- tzdata-2008e-pakistan+morocco.patch | 26 ++++++++++++++++++++++++++ tzdata.spec | 8 +++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tzdata-2008e-pakistan+morocco.patch diff --git a/tzdata-2008e-pakistan+morocco.patch b/tzdata-2008e-pakistan+morocco.patch new file mode 100644 index 0000000..caa0c15 --- /dev/null +++ b/tzdata-2008e-pakistan+morocco.patch @@ -0,0 +1,26 @@ +diff -urp tzdata/tzdata2008e/africa tzdata-2008e/tzdata2008e/africa +--- tzdata/tzdata2008e/africa 2008-07-20 21:47:07.000000000 +0200 ++++ tzdata-2008e/tzdata2008e/africa 2008-08-28 13:17:44.000000000 +0200 +@@ -542,7 +542,7 @@ Rule Morocco 1977 only - Sep 28 0:00 0 + Rule Morocco 1978 only - Jun 1 0:00 1:00 S + Rule Morocco 1978 only - Aug 4 0:00 0 - + Rule Morocco 2008 only - Jun 1 0:00 1:00 S +-Rule Morocco 2008 only - Sep 28 0:00 0 - ++Rule Morocco 2008 only - Sep 1 0:00 0 - + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 + 0:00 Morocco WE%sT 1984 Mar 16 +Only in tzdata-2008e/tzdata2008e/: africa~ +diff -urp tzdata/tzdata2008e/asia tzdata-2008e/tzdata2008e/asia +--- tzdata/tzdata2008e/asia 2008-07-20 21:09:44.000000000 +0200 ++++ tzdata-2008e/tzdata2008e/asia 2008-08-28 13:17:44.000000000 +0200 +@@ -1545,7 +1545,7 @@ Zone Asia/Muscat 3:54:20 - LMT 1920 + Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S + Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 - + Rule Pakistan 2008 only - Jun 1 0:00 1:00 S +-Rule Pakistan 2008 only - Sep 1 0:00 0 - ++Rule Pakistan 2008 only - Nov 1 0:00 0 - + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Asia/Karachi 4:28:12 - LMT 1907 + 5:30 - IST 1942 Sep +Only in tzdata-2008e/tzdata2008e/: asia~ diff --git a/tzdata.spec b/tzdata.spec index aad7bf8..1a7a7ad 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2008e %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -16,6 +16,7 @@ Source0: tzdata-base-0.tar.bz2 # These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +Patch1: tzdata-2008e-pakistan+morocco.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -47,6 +48,7 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig +%patch1 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -107,6 +109,10 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Thu Aug 28 2008 Petr Machata - 2008e-2 +- Pakistan DST is scheduled until Oct/31 +- Morocco DST is scheduled until Aug/31 + * Tue Aug 12 2008 Petr Machata - 2008e-1 - Upstream 2008e - Changes for Mauritius From e1cfa5bb810965b76341c0252c5407d6cb39426d Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 16 Sep 2008 11:00:15 +0000 Subject: [PATCH 073/280] - Upstream 2008f - Changes for Mauritius (extends DST to years to come) - Palestine changes clocks for the duration of Ramadan - Argentina will start DST on Sunday October 19, 2008 - Brazil will start DST on 2008-10-19 - Drop Pakistan and Morocco patches - Drop obsolete patches --- .cvsignore | 1 + sources | 2 +- tzdata-2008e-pakistan+morocco.patch | 26 -------------------------- tzdata-casablanca.patch | 19 ------------------- tzdata-karachi.patch | 12 ------------ tzdata.spec | 16 +++++++++++----- 6 files changed, 13 insertions(+), 63 deletions(-) delete mode 100644 tzdata-2008e-pakistan+morocco.patch delete mode 100644 tzdata-casablanca.patch delete mode 100644 tzdata-karachi.patch diff --git a/.cvsignore b/.cvsignore index 75a117b..68a7bdb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -10,3 +10,4 @@ tzdata2008c.tar.gz tzdata2008d.tar.gz tzdata2008e.tar.gz tzcode2008e.tar.gz +tzdata2008f.tar.gz diff --git a/sources b/sources index f5d46c8..bd99bcb 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -3b4578110a3d193ed9a00d61f27aba28 tzdata2008e.tar.gz 12ec2d85324ddcba39db1471a03f486b tzcode2008e.tar.gz +aa3b077a7b786d46c131303b1d75deee tzdata2008f.tar.gz diff --git a/tzdata-2008e-pakistan+morocco.patch b/tzdata-2008e-pakistan+morocco.patch deleted file mode 100644 index caa0c15..0000000 --- a/tzdata-2008e-pakistan+morocco.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -urp tzdata/tzdata2008e/africa tzdata-2008e/tzdata2008e/africa ---- tzdata/tzdata2008e/africa 2008-07-20 21:47:07.000000000 +0200 -+++ tzdata-2008e/tzdata2008e/africa 2008-08-28 13:17:44.000000000 +0200 -@@ -542,7 +542,7 @@ Rule Morocco 1977 only - Sep 28 0:00 0 - Rule Morocco 1978 only - Jun 1 0:00 1:00 S - Rule Morocco 1978 only - Aug 4 0:00 0 - - Rule Morocco 2008 only - Jun 1 0:00 1:00 S --Rule Morocco 2008 only - Sep 28 0:00 0 - -+Rule Morocco 2008 only - Sep 1 0:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 - 0:00 Morocco WE%sT 1984 Mar 16 -Only in tzdata-2008e/tzdata2008e/: africa~ -diff -urp tzdata/tzdata2008e/asia tzdata-2008e/tzdata2008e/asia ---- tzdata/tzdata2008e/asia 2008-07-20 21:09:44.000000000 +0200 -+++ tzdata-2008e/tzdata2008e/asia 2008-08-28 13:17:44.000000000 +0200 -@@ -1545,7 +1545,7 @@ Zone Asia/Muscat 3:54:20 - LMT 1920 - Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S - Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 - - Rule Pakistan 2008 only - Jun 1 0:00 1:00 S --Rule Pakistan 2008 only - Sep 1 0:00 0 - -+Rule Pakistan 2008 only - Nov 1 0:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Karachi 4:28:12 - LMT 1907 - 5:30 - IST 1942 Sep -Only in tzdata-2008e/tzdata2008e/: asia~ diff --git a/tzdata-casablanca.patch b/tzdata-casablanca.patch deleted file mode 100644 index 798a2a0..0000000 --- a/tzdata-casablanca.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urp tzdata/tzdata2008b/africa tzdata-pm/tzdata2008b/africa ---- tzdata/tzdata2008b/africa 2008-03-24 13:30:58.000000000 +0100 -+++ tzdata-pm/tzdata2008b/africa 2008-05-26 13:38:43.000000000 +0200 -@@ -416,11 +416,13 @@ Rule Morocco 1976 only - Aug 1 0:00 0 - Rule Morocco 1977 only - Sep 28 0:00 0 - - Rule Morocco 1978 only - Jun 1 0:00 1:00 S - Rule Morocco 1978 only - Aug 4 0:00 0 - -+Rule Morocco 2008 only - Jun 1 0:00 1:00 S -+Rule Morocco 2008 only - Sep 28 0:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 - 0:00 Morocco WE%sT 1984 Mar 16 - 1:00 - CET 1986 -- 0:00 - WET -+ 0:00 Morocco WE%sT - # Western Sahara - Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan - -1:00 - WAT 1976 Apr 14 -Only in tzdata-pm/tzdata2008b: africa~ diff --git a/tzdata-karachi.patch b/tzdata-karachi.patch deleted file mode 100644 index 409ee4b..0000000 --- a/tzdata-karachi.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp tzdata/tzdata2008b/asia tzdata-pm/tzdata2008b/asia ---- tzdata/tzdata2008b/asia 2008-03-24 13:30:58.000000000 +0100 -+++ tzdata-pm/tzdata2008b/asia 2008-05-19 13:00:50.000000000 +0200 -@@ -1465,6 +1465,8 @@ Zone Asia/Muscat 3:54:20 - LMT 1920 - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S - Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 - -+Rule Pakistan 2008 only - Jun 1 0:01 1:00 S -+Rule Pakistan 2008 only - Aug 31 0:01 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Karachi 4:28:12 - LMT 1907 - 5:30 - IST 1942 Sep diff --git a/tzdata.spec b/tzdata.spec index 1a7a7ad..307a95b 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2008e +Version: 2008f %define tzdata_version %{version} -%define tzcode_version %{version} -Release: 2%{?dist} +%define tzcode_version 2008e +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -16,7 +16,6 @@ Source0: tzdata-base-0.tar.bz2 # These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz -Patch1: tzdata-2008e-pakistan+morocco.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -48,7 +47,6 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig -%patch1 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -109,6 +107,14 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Tue Sep 16 2008 Petr Machata - 2008f-1 +- Upstream 2008f + - Changes for Mauritius (extends DST to years to come) + - Palestine changes clocks for the duration of Ramadan + - Argentina will start DST on Sunday October 19, 2008 + - Brazil will start DST on 2008-10-19 +- Drop Pakistan and Morocco patches + * Thu Aug 28 2008 Petr Machata - 2008e-2 - Pakistan DST is scheduled until Oct/31 - Morocco DST is scheduled until Aug/31 From aecd118120c18495f74208fa47056c849c77f841 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 7 Oct 2008 08:37:25 +0000 Subject: [PATCH 074/280] - Upstream 2008g - Fixed future DST transitions for Brazil --- .cvsignore | 2 ++ sources | 4 ++-- tzdata.spec | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 68a7bdb..2e25164 100644 --- a/.cvsignore +++ b/.cvsignore @@ -11,3 +11,5 @@ tzdata2008d.tar.gz tzdata2008e.tar.gz tzcode2008e.tar.gz tzdata2008f.tar.gz +tzdata2008g.tar.gz +tzcode2008g.tar.gz diff --git a/sources b/sources index bd99bcb..3f7f4f1 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -12ec2d85324ddcba39db1471a03f486b tzcode2008e.tar.gz -aa3b077a7b786d46c131303b1d75deee tzdata2008f.tar.gz +47d63b6f3b8ea7bd770a32dbe3c5f7a0 tzdata2008g.tar.gz +1af9daa24d9f9c0ace7f9b67dc8753fa tzcode2008g.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 307a95b..2d803de 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2008f +Version: 2008g %define tzdata_version %{version} -%define tzcode_version 2008e +%define tzcode_version %{version} Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -107,6 +107,10 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Tue Oct 7 2008 Petr Machata - 2008g-1 +- Upstream 2008g + - Fixed future DST transitions for Brazil + * Tue Sep 16 2008 Petr Machata - 2008f-1 - Upstream 2008f - Changes for Mauritius (extends DST to years to come) From 24f64eb224a66c88acd7a5bd6d5b7e2627c90b69 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 13 Oct 2008 08:51:07 +0000 Subject: [PATCH 075/280] Basically just testing whether CVS commit works for me. --- tzdata.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 2d803de..5b33441 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -9,7 +9,7 @@ Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ # The tzdata-base-0.tar.bz2 is a simple building infrastructure and -# test suite. It is occasionally updated from glibc sources, and as +# a test suite. It is occasionally updated from glibc sources, and as # such is under LGPLv2+, but none of this ever gets to be part of # final zoneinfo files. Source0: tzdata-base-0.tar.bz2 From 5a95e286fdc05de7142b28ba0e9e8e8ae231bdc8 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 13 Oct 2008 12:04:17 +0000 Subject: [PATCH 076/280] - Upstream 2008h - Fix exact DST transition hour for Mauritius - Syria will leave the period of DST on Nov 1 - Fix coordinates of Pacific/Niue --- .cvsignore | 2 ++ sources | 4 ++-- tzdata.spec | 8 +++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2e25164..979eeb4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -13,3 +13,5 @@ tzcode2008e.tar.gz tzdata2008f.tar.gz tzdata2008g.tar.gz tzcode2008g.tar.gz +tzdata2008h.tar.gz +tzcode2008h.tar.gz diff --git a/sources b/sources index 3f7f4f1..2ec30c7 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -47d63b6f3b8ea7bd770a32dbe3c5f7a0 tzdata2008g.tar.gz -1af9daa24d9f9c0ace7f9b67dc8753fa tzcode2008g.tar.gz +599dba784de0a560ba1a5ba1fdbb2082 tzdata2008h.tar.gz +2f0fc8b1227bd7289483f64e8a194ed9 tzcode2008h.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 5b33441..00acdf0 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2008g +Version: 2008h %define tzdata_version %{version} %define tzcode_version %{version} Release: 1%{?dist} @@ -107,6 +107,12 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Oct 13 2008 Petr Machata - 2008h-1 +- Upstream 2008h + - Fix exact DST transition hour for Mauritius + - Syria will leave the period of DST on Nov 1 + - Fix coordinates of Pacific/Niue + * Tue Oct 7 2008 Petr Machata - 2008g-1 - Upstream 2008g - Fixed future DST transitions for Brazil From f32fb8d141ea2307858432b2c930e99122702517 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 30 Oct 2008 11:44:55 +0000 Subject: [PATCH 077/280] - Upstream 2008i - Updates for Argentina: Drop DST in zones America/Argentina/Jujuy, La_Rioja, San_Juan, Catamarca, Mendoza, Rio_Gallegos, Ushuaia; new zone America/Argentina/Salta (for provinces SA, LP, NQ, RN). --- .cvsignore | 1 + sources | 2 +- tzdata.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 979eeb4..ae65b7b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -15,3 +15,4 @@ tzdata2008g.tar.gz tzcode2008g.tar.gz tzdata2008h.tar.gz tzcode2008h.tar.gz +tzdata2008i.tar.gz diff --git a/sources b/sources index 2ec30c7..8fc8137 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -599dba784de0a560ba1a5ba1fdbb2082 tzdata2008h.tar.gz 2f0fc8b1227bd7289483f64e8a194ed9 tzcode2008h.tar.gz +b659aac215ca5d1ef43c596cfb561252 tzdata2008i.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 00acdf0..209a2fd 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2008h +Version: 2008i %define tzdata_version %{version} -%define tzcode_version %{version} +%define tzcode_version 2008h Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -107,6 +107,12 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Thu Oct 30 2008 Petr Machata - 2008i-1 +- Upstream 2008i + - Updates for Argentina: Drop DST in zones America/Argentina/Jujuy, + La_Rioja, San_Juan, Catamarca, Mendoza, Rio_Gallegos, Ushuaia; new + zone America/Argentina/Salta (for provinces SA, LP, NQ, RN). + * Mon Oct 13 2008 Petr Machata - 2008h-1 - Upstream 2008h - Fix exact DST transition hour for Mauritius From b28955d32a7b2b72f25d241e3fd64dd50e2f2371 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 23 Jan 2009 11:44:44 +0000 Subject: [PATCH 078/280] - Upstream 2009a - Fix Asia/Kathmandu spelling - Historical timestamps for Switzerland and Cuba - DST update for America/Resolute --- .cvsignore | 2 ++ sources | 4 ++-- tzdata.spec | 10 ++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index ae65b7b..08145b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -16,3 +16,5 @@ tzcode2008g.tar.gz tzdata2008h.tar.gz tzcode2008h.tar.gz tzdata2008i.tar.gz +tzdata2009a.tar.gz +tzcode2009a.tar.gz diff --git a/sources b/sources index 8fc8137..fa8a9c7 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -2f0fc8b1227bd7289483f64e8a194ed9 tzcode2008h.tar.gz -b659aac215ca5d1ef43c596cfb561252 tzdata2008i.tar.gz +979cb227a83d7fbb954611a4fb5b1949 tzdata2009a.tar.gz +6a20a58704c779e3006394cf38a1dc0a tzcode2009a.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 209a2fd..4128196 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2008i +Version: 2009a %define tzdata_version %{version} -%define tzcode_version 2008h +%define tzcode_version %{version} Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -107,6 +107,12 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Fri Jan 23 2009 Petr Machata - 2009a-1 +- Upstream 2009a + - Fix Asia/Kathmandu spelling + - Historical timestamps for Switzerland and Cuba + - DST update for America/Resolute + * Thu Oct 30 2008 Petr Machata - 2008i-1 - Upstream 2008i - Updates for Argentina: Drop DST in zones America/Argentina/Jujuy, From 2d1d19b4e1cb0faf1453a809bbec3b64815e31c6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 22:25:32 +0000 Subject: [PATCH 079/280] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 4128196..8d3c274 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2009a %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -107,6 +107,9 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 2009a-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Jan 23 2009 Petr Machata - 2009a-1 - Upstream 2009a - Fix Asia/Kathmandu spelling From e89b5fceab426e1240b00dcbe08de099ce7238b8 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 23 Mar 2009 14:24:13 +0000 Subject: [PATCH 080/280] - Upstream 2009d - Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 - Tunisia will not observe DST this year. - Syria will start DST on 2009-03-27 00:00 this year - Cuba will start DST on midnight between 2009-03-07 and 2009-03-08 - Province of San Luis, Argentina, went to UTC-04:00 on 2009-03-15 --- .cvsignore | 2 ++ sources | 4 ++-- tzdata.spec | 12 ++++++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 08145b1..959546a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -18,3 +18,5 @@ tzcode2008h.tar.gz tzdata2008i.tar.gz tzdata2009a.tar.gz tzcode2009a.tar.gz +tzdata2009d.tar.gz +tzcode2009d.tar.gz diff --git a/sources b/sources index fa8a9c7..d90933b 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -979cb227a83d7fbb954611a4fb5b1949 tzdata2009a.tar.gz -6a20a58704c779e3006394cf38a1dc0a tzcode2009a.tar.gz +95a7af89e6ec9a08096dda3c659d1bf3 tzdata2009d.tar.gz +bcd22fb108f302bdcc2128e3de915550 tzcode2009d.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 8d3c274..c53a4fb 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2009a +Version: 2009d %define tzdata_version %{version} %define tzcode_version %{version} -Release: 2%{?dist} +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -107,6 +107,14 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Mar 23 2009 Petr Machata - 2009d-1 +- Upstream 2009d + - Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 + - Tunisia will not observe DST this year. + - Syria will start DST on 2009-03-27 00:00 this year + - Cuba will start DST on midnight between 2009-03-07 and 2009-03-08 + - Province of San Luis, Argentina, went to UTC-04:00 on 2009-03-15 + * Wed Feb 25 2009 Fedora Release Engineering - 2009a-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ddeb3c47967173033cb736f710fc35349febe531 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 13 Apr 2009 11:57:32 +0000 Subject: [PATCH 081/280] - Upstream 2009e - Historical changes for Jordan - Palestine will start DST on 2009-03-26 and end 2009-09-27 - Egypt ends DST on 2009-09-24 - Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01 --- tzdata-2009e-karachi.patch | 13 +++++++++++++ tzdata.spec | 17 +++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 tzdata-2009e-karachi.patch diff --git a/tzdata-2009e-karachi.patch b/tzdata-2009e-karachi.patch new file mode 100644 index 0000000..f6c00bc --- /dev/null +++ b/tzdata-2009e-karachi.patch @@ -0,0 +1,13 @@ +diff -urp tzdata2009e/asia tzdata2009e.pm/asia +--- tzdata2009e/asia 2009-04-06 15:08:11.000000000 +0200 ++++ tzdata2009e.pm/asia 2009-04-13 13:31:28.000000000 +0200 +@@ -1593,7 +1593,8 @@ Zone Asia/Muscat 3:54:20 - LMT 1920 + Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S + Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 - + Rule Pakistan 2008 only - Jun 1 0:00 1:00 S +-Rule Pakistan 2008 only - Nov 1 0:00 0 - ++Rule Pakistan 2008 2009 - Nov 1 0:00 0 - ++Rule Pakistan 2009 only - Apr 15 0:00 1:00 S + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Asia/Karachi 4:28:12 - LMT 1907 + 5:30 - IST 1942 Sep diff --git a/tzdata.spec b/tzdata.spec index c53a4fb..3035040 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2009d +Version: 2009e %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -16,6 +16,8 @@ Source0: tzdata-base-0.tar.bz2 # These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +Patch1: tzdata-2009e-cairo.patch +Patch2: tzdata-2009e-karachi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -47,6 +49,8 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig +%patch1 -p0 +%patch2 -p0 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -107,6 +111,15 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Apr 13 2009 Petr Machata - 2009e-2 +- Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01 + +* Mon Apr 6 2009 Petr Machata - 2009e-1 +- Upstream 2009e + - Historical changes for Jordan + - Palestine will start DST on 2009-03-26 and end 2009-09-27 +- Egypt ends DST on 2009-09-24 + * Mon Mar 23 2009 Petr Machata - 2009d-1 - Upstream 2009d - Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 From f40318c0447f4e2e2c1b0cb46f087a85ba3fa2db Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 13 Apr 2009 12:31:11 +0000 Subject: [PATCH 082/280] Forgotten cairo patch --- tzdata-2009e-cairo.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 tzdata-2009e-cairo.patch diff --git a/tzdata-2009e-cairo.patch b/tzdata-2009e-cairo.patch new file mode 100644 index 0000000..6a35647 --- /dev/null +++ b/tzdata-2009e-cairo.patch @@ -0,0 +1,15 @@ +diff -up tzdata2009e/africa tzdata2009e-pm/africa +--- tzdata2009e/africa 2009-03-23 14:37:51.000000000 +0100 ++++ tzdata2009e-pm/africa 2009-04-06 16:06:49.000000000 +0200 +@@ -236,7 +236,8 @@ Rule Egypt 2007 only - Sep Thu>=1 23:00s + # unless discontinued, next DST may end Thursday 28 August 2008. + # From Paul Eggert (2007-08-17): + # For lack of better info, assume the new rule is last Thursday in August. +-Rule Egypt 2008 max - Aug lastThu 23:00s 0 - ++Rule Egypt 2008 only - Aug lastThu 23:00s 0 - ++Rule Egypt 2009 max - Sep lastThu 23:00s 0 - + + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Africa/Cairo 2:05:00 - LMT 1900 Oct + +Diff finished. Mon Apr 6 16:06:53 2009 From b8cf1e2fda098b258ff430f2c75408c48a2ca1f3 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 13 Apr 2009 12:43:52 +0000 Subject: [PATCH 083/280] Forgot to upload sources --- .cvsignore | 2 ++ sources | 4 ++-- tzdata.spec | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 959546a..63f2490 100644 --- a/.cvsignore +++ b/.cvsignore @@ -20,3 +20,5 @@ tzdata2009a.tar.gz tzcode2009a.tar.gz tzdata2009d.tar.gz tzcode2009d.tar.gz +tzdata2009e.tar.gz +tzcode2009e.tar.gz diff --git a/sources b/sources index d90933b..3b93ea4 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -95a7af89e6ec9a08096dda3c659d1bf3 tzdata2009d.tar.gz -bcd22fb108f302bdcc2128e3de915550 tzcode2009d.tar.gz +206709f3373f8baebaec07b3d8b7ac40 tzdata2009e.tar.gz +329c3ff06919193c55a293a73a8c618f tzcode2009e.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 3035040..7dd9e0d 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2009e %define tzdata_version %{version} %define tzcode_version %{version} -Release: 2%{?dist} +Release: 3%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -111,6 +111,9 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Apr 13 2009 Petr Machata - 2009e-3 +- Bump up for rebuild + * Mon Apr 13 2009 Petr Machata - 2009e-2 - Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01 From 9136b9db3f052bf4c872a67967432a21e78d30d7 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 13 Apr 2009 14:08:59 +0000 Subject: [PATCH 084/280] Upstream now has the Pakistan change. --- .cvsignore | 1 + sources | 2 +- tzdata-2009e-cairo.patch | 4 ++-- tzdata-2009e-karachi.patch | 13 ------------- tzdata.spec | 13 ++++++++----- 5 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 tzdata-2009e-karachi.patch diff --git a/.cvsignore b/.cvsignore index 63f2490..315fa3e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -22,3 +22,4 @@ tzdata2009d.tar.gz tzcode2009d.tar.gz tzdata2009e.tar.gz tzcode2009e.tar.gz +tzdata2009f.tar.gz diff --git a/sources b/sources index 3b93ea4..6998380 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -206709f3373f8baebaec07b3d8b7ac40 tzdata2009e.tar.gz 329c3ff06919193c55a293a73a8c618f tzcode2009e.tar.gz +ff432bff80111f4bb998be5d4fd6260d tzdata2009f.tar.gz diff --git a/tzdata-2009e-cairo.patch b/tzdata-2009e-cairo.patch index 6a35647..ee86ed9 100644 --- a/tzdata-2009e-cairo.patch +++ b/tzdata-2009e-cairo.patch @@ -1,6 +1,6 @@ diff -up tzdata2009e/africa tzdata2009e-pm/africa ---- tzdata2009e/africa 2009-03-23 14:37:51.000000000 +0100 -+++ tzdata2009e-pm/africa 2009-04-06 16:06:49.000000000 +0200 +--- tzdata2009f/africa 2009-03-23 14:37:51.000000000 +0100 ++++ tzdata2009f-pm/africa 2009-04-06 16:06:49.000000000 +0200 @@ -236,7 +236,8 @@ Rule Egypt 2007 only - Sep Thu>=1 23:00s # unless discontinued, next DST may end Thursday 28 August 2008. # From Paul Eggert (2007-08-17): diff --git a/tzdata-2009e-karachi.patch b/tzdata-2009e-karachi.patch deleted file mode 100644 index f6c00bc..0000000 --- a/tzdata-2009e-karachi.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urp tzdata2009e/asia tzdata2009e.pm/asia ---- tzdata2009e/asia 2009-04-06 15:08:11.000000000 +0200 -+++ tzdata2009e.pm/asia 2009-04-13 13:31:28.000000000 +0200 -@@ -1593,7 +1593,8 @@ Zone Asia/Muscat 3:54:20 - LMT 1920 - Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S - Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 - - Rule Pakistan 2008 only - Jun 1 0:00 1:00 S --Rule Pakistan 2008 only - Nov 1 0:00 0 - -+Rule Pakistan 2008 2009 - Nov 1 0:00 0 - -+Rule Pakistan 2009 only - Apr 15 0:00 1:00 S - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Karachi 4:28:12 - LMT 1907 - 5:30 - IST 1942 Sep diff --git a/tzdata.spec b/tzdata.spec index 7dd9e0d..d93da40 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2009e +Version: 2009f %define tzdata_version %{version} -%define tzcode_version %{version} -Release: 3%{?dist} +%define tzcode_version 2009e +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -17,7 +17,6 @@ Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz Patch1: tzdata-2009e-cairo.patch -Patch2: tzdata-2009e-karachi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -50,7 +49,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig %patch1 -p0 -%patch2 -p0 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -111,6 +109,11 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Apr 13 2009 Petr Machata - 2009f-1 +- Upstream 2009f + - Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01 +- Drop Pakistan patch + * Mon Apr 13 2009 Petr Machata - 2009e-3 - Bump up for rebuild From 5487d04f1f5e42ea34ce3dd8ca8b8e6c3205272e Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 26 May 2009 14:46:06 +0000 Subject: [PATCH 085/280] - Upstream 2009h - Convert use of 00:00 stamps to 24:00 of the previous day - Clarify that the data is Public Domain - Drop Cairo patch --- .cvsignore | 2 ++ sources | 4 ++-- tzdata-2009e-cairo.patch | 15 --------------- tzdata.spec | 12 ++++++++---- 4 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 tzdata-2009e-cairo.patch diff --git a/.cvsignore b/.cvsignore index 315fa3e..86f4268 100644 --- a/.cvsignore +++ b/.cvsignore @@ -23,3 +23,5 @@ tzcode2009d.tar.gz tzdata2009e.tar.gz tzcode2009e.tar.gz tzdata2009f.tar.gz +tzdata2009h.tar.gz +tzcode2009h.tar.gz diff --git a/sources b/sources index 6998380..0369936 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -329c3ff06919193c55a293a73a8c618f tzcode2009e.tar.gz -ff432bff80111f4bb998be5d4fd6260d tzdata2009f.tar.gz +7feb330364d2837e3b4fdb0ae3ae1e92 tzdata2009h.tar.gz +436a21bbbcc26216f7aa72e512badbd6 tzcode2009h.tar.gz diff --git a/tzdata-2009e-cairo.patch b/tzdata-2009e-cairo.patch deleted file mode 100644 index ee86ed9..0000000 --- a/tzdata-2009e-cairo.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up tzdata2009e/africa tzdata2009e-pm/africa ---- tzdata2009f/africa 2009-03-23 14:37:51.000000000 +0100 -+++ tzdata2009f-pm/africa 2009-04-06 16:06:49.000000000 +0200 -@@ -236,7 +236,8 @@ Rule Egypt 2007 only - Sep Thu>=1 23:00s - # unless discontinued, next DST may end Thursday 28 August 2008. - # From Paul Eggert (2007-08-17): - # For lack of better info, assume the new rule is last Thursday in August. --Rule Egypt 2008 max - Aug lastThu 23:00s 0 - -+Rule Egypt 2008 only - Aug lastThu 23:00s 0 - -+Rule Egypt 2009 max - Sep lastThu 23:00s 0 - - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Cairo 2:05:00 - LMT 1900 Oct - -Diff finished. Mon Apr 6 16:06:53 2009 diff --git a/tzdata.spec b/tzdata.spec index d93da40..a44a340 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2009f +Version: 2009h %define tzdata_version %{version} -%define tzcode_version 2009e +%define tzcode_version %{version} Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -16,7 +16,6 @@ Source0: tzdata-base-0.tar.bz2 # These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz -Patch1: tzdata-2009e-cairo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -48,7 +47,6 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig -%patch1 -p0 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -109,6 +107,12 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Tue May 26 2009 Petr Machata - 2009h-1 +- Upstream 2009h + - Convert use of 00:00 stamps to 24:00 of the previous day + - Clarify that the data is Public Domain +- Drop Cairo patch + * Mon Apr 13 2009 Petr Machata - 2009f-1 - Upstream 2009f - Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01 From 4230440b1ff6edf15f8a856ad8288f4a2a683b7d Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 26 May 2009 15:00:19 +0000 Subject: [PATCH 086/280] bump for misplaced tag --- tzdata.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index a44a340..3ea6b44 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2009h %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -107,7 +107,7 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog -* Tue May 26 2009 Petr Machata - 2009h-1 +* Tue May 26 2009 Petr Machata - 2009h-2 - Upstream 2009h - Convert use of 00:00 stamps to 24:00 of the previous day - Clarify that the data is Public Domain From 3bc3fac446e62e04bf67131570a83382b8c85c38 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 8 Jun 2009 18:32:26 +0000 Subject: [PATCH 087/280] - Upstream 2009i - Bangladesh introduces DST 2009-06-20 --- .cvsignore | 2 ++ sources | 4 ++-- tzdata.spec | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 86f4268..2c6cf35 100644 --- a/.cvsignore +++ b/.cvsignore @@ -25,3 +25,5 @@ tzcode2009e.tar.gz tzdata2009f.tar.gz tzdata2009h.tar.gz tzcode2009h.tar.gz +tzdata2009i.tar.gz +tzcode2009i.tar.gz diff --git a/sources b/sources index 0369936..63c5730 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -7feb330364d2837e3b4fdb0ae3ae1e92 tzdata2009h.tar.gz -436a21bbbcc26216f7aa72e512badbd6 tzcode2009h.tar.gz +5c74f0acf58617728aa30f7777e605e0 tzdata2009i.tar.gz +5708cf87bd6e55d7132d4faab40bcfcf tzcode2009i.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 3ea6b44..9b131d1 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2009h +Version: 2009i %define tzdata_version %{version} %define tzcode_version %{version} -Release: 2%{?dist} +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -107,6 +107,10 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Jun 8 2009 Petr Machata - 2009i-1 +- Upstream 2009i + - Bangladesh introduces DST 2009-06-20 + * Tue May 26 2009 Petr Machata - 2009h-2 - Upstream 2009h - Convert use of 00:00 stamps to 24:00 of the previous day From 627f0355b47cf0f1102e01ee9cc006dc915480c2 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 18 Jun 2009 12:18:00 +0000 Subject: [PATCH 088/280] - Upstream 2009j - DST switch for Bangladesh will occur an hour earlier than was thought. --- .cvsignore | 1 + sources | 2 +- tzdata.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2c6cf35..9562038 100644 --- a/.cvsignore +++ b/.cvsignore @@ -27,3 +27,4 @@ tzdata2009h.tar.gz tzcode2009h.tar.gz tzdata2009i.tar.gz tzcode2009i.tar.gz +tzdata2009j.tar.gz diff --git a/sources b/sources index 63c5730..f3b0da2 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -5c74f0acf58617728aa30f7777e605e0 tzdata2009i.tar.gz 5708cf87bd6e55d7132d4faab40bcfcf tzcode2009i.tar.gz +ad733f772e722873bf0daa7d88dda603 tzdata2009j.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 9b131d1..8f9ae83 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2009i +Version: 2009j %define tzdata_version %{version} -%define tzcode_version %{version} +%define tzcode_version 2009i Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -107,6 +107,11 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Thu Jun 18 2009 Petr Machata - 2009j-1 +- Upstream 2009j + - DST switch for Bangladesh will occur an hour earlier than was + thought. + * Mon Jun 8 2009 Petr Machata - 2009i-1 - Upstream 2009i - Bangladesh introduces DST 2009-06-20 From 5e008fcce7b427a2fcf16c39f995e7071f6beef5 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 20 Jul 2009 15:38:27 +0000 Subject: [PATCH 089/280] - Upstream 2009k - Mauritius will not continue to observe DST the coming summer - Arbitrarily end DST at the end of 2009 so that a POSIX-sytle time zone string can appear in the Dhaka binary file --- .cvsignore | 2 ++ sources | 4 ++-- tzdata.spec | 10 ++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9562038..445518b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -28,3 +28,5 @@ tzcode2009h.tar.gz tzdata2009i.tar.gz tzcode2009i.tar.gz tzdata2009j.tar.gz +tzdata2009k.tar.gz +tzcode2009k.tar.gz diff --git a/sources b/sources index f3b0da2..f71af41 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -5708cf87bd6e55d7132d4faab40bcfcf tzcode2009i.tar.gz -ad733f772e722873bf0daa7d88dda603 tzdata2009j.tar.gz +54fce464fa9d9f77d48632bbf6fd74aa tzdata2009k.tar.gz +d181116286661375966a350e3e358cfa tzcode2009k.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 8f9ae83..a497260 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2009j +Version: 2009k %define tzdata_version %{version} -%define tzcode_version 2009i +%define tzcode_version %{version} Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -107,6 +107,12 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Jul 20 2009 Petr Machata - 2009k-1 +- Upstream 2009k + - Mauritius will not continue to observe DST the coming summer + - Arbitrarily end DST at the end of 2009 so that a POSIX-sytle time + zone string can appear in the Dhaka binary file + * Thu Jun 18 2009 Petr Machata - 2009j-1 - Upstream 2009j - DST switch for Bangladesh will occur an hour earlier than was From e052d054a05cdfd741763feb3950d308379da983 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:25:49 +0000 Subject: [PATCH 090/280] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index a497260..bf17df0 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2009k %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -107,6 +107,9 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 2009k-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Jul 20 2009 Petr Machata - 2009k-1 - Upstream 2009k - Mauritius will not continue to observe DST the coming summer From 50ddd8337d1a9a444575041f63fa2dd8677aec17 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 13 Aug 2009 11:48:06 +0000 Subject: [PATCH 091/280] - Egypt starts winter time on August 21. --- tzdata-2009k-cairo.patch | 14 ++++++++++++++ tzdata.spec | 9 +++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 tzdata-2009k-cairo.patch diff --git a/tzdata-2009k-cairo.patch b/tzdata-2009k-cairo.patch new file mode 100644 index 0000000..5b8ec91 --- /dev/null +++ b/tzdata-2009k-cairo.patch @@ -0,0 +1,14 @@ +diff -up /home/petr/fedora/tzdata/devel/tzdata/tzdata2009k/africa\~ /home/petr/fedora/tzdata/devel/tzdata/tzdata2009k/africa +--- tzdata2009k/africa 2009-07-20 15:45:47.000000000 +0200 ++++ tzdata2009k/africa 2009-08-12 13:56:08.000000000 +0200 +@@ -277,7 +277,7 @@ Rule Egypt 2007 only - Sep Thu>=1 23:00s + # Thursday in September; Egypt is expected to revert to the last Thursday + # in September. + Rule Egypt 2008 only - Aug lastThu 23:00s 0 - +-Rule Egypt 2009 max - Sep lastThu 23:00s 0 - ++Rule Egypt 2009 max - Aug 20 24:00 0 - + + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Africa/Cairo 2:05:00 - LMT 1900 Oct + +Diff finished. Wed Aug 12 13:57:48 2009 diff --git a/tzdata.spec b/tzdata.spec index bf17df0..c989db1 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2009k %define tzdata_version %{version} %define tzcode_version %{version} -Release: 2%{?dist} +Release: 3%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -16,6 +16,7 @@ Source0: tzdata-base-0.tar.bz2 # These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +Patch1: tzdata-2009k-cairo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -47,6 +48,7 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig +%patch1 -p0 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -107,13 +109,16 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Thu Aug 13 2009 Petr Machata - 2009k-3 +- Egypt starts winter time on August 21. + * Sun Jul 26 2009 Fedora Release Engineering - 2009k-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Mon Jul 20 2009 Petr Machata - 2009k-1 - Upstream 2009k - Mauritius will not continue to observe DST the coming summer - - Arbitrarily end DST at the end of 2009 so that a POSIX-sytle time + - Arbitrarily end DST at the end of 2009 so that a POSIX-style time zone string can appear in the Dhaka binary file * Thu Jun 18 2009 Petr Machata - 2009j-1 From f7d888912f4f20a51681ee91299f6e1b52c5ae23 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 16 Sep 2009 11:58:55 +0000 Subject: [PATCH 092/280] - Upstream 2009m - Palestine will will revert back to winter time on Friday, 2009-09-04 - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010 - Drop Egypt patch --- .cvsignore | 1 + sources | 2 +- tzdata.spec | 14 +++++++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 445518b..b396aa3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -30,3 +30,4 @@ tzcode2009i.tar.gz tzdata2009j.tar.gz tzdata2009k.tar.gz tzcode2009k.tar.gz +tzdata2009m.tar.gz diff --git a/sources b/sources index f71af41..5a7a1ed 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -54fce464fa9d9f77d48632bbf6fd74aa tzdata2009k.tar.gz d181116286661375966a350e3e358cfa tzcode2009k.tar.gz +5314fe1483c7c1be17c50f2c2171e06b tzdata2009m.tar.gz diff --git a/tzdata.spec b/tzdata.spec index c989db1..1560a82 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2009k +Version: 2009m %define tzdata_version %{version} -%define tzcode_version %{version} -Release: 3%{?dist} +%define tzcode_version 2009k +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -16,7 +16,6 @@ Source0: tzdata-base-0.tar.bz2 # These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz -Patch1: tzdata-2009k-cairo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -48,7 +47,6 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig -%patch1 -p0 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -109,6 +107,12 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Wed Sep 16 2009 Petr Machata - 2009m-1 +- Upstream 2009m + - Palestine will will revert back to winter time on Friday, 2009-09-04 + - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010 +- Drop Egypt patch + * Thu Aug 13 2009 Petr Machata - 2009k-3 - Egypt starts winter time on August 21. From 1eaaf147d9523318e3ae4a3442884583bd26a87f Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 16 Sep 2009 11:59:58 +0000 Subject: [PATCH 093/280] Forgot to drop the cairo patch --- tzdata-2009k-cairo.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 tzdata-2009k-cairo.patch diff --git a/tzdata-2009k-cairo.patch b/tzdata-2009k-cairo.patch deleted file mode 100644 index 5b8ec91..0000000 --- a/tzdata-2009k-cairo.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up /home/petr/fedora/tzdata/devel/tzdata/tzdata2009k/africa\~ /home/petr/fedora/tzdata/devel/tzdata/tzdata2009k/africa ---- tzdata2009k/africa 2009-07-20 15:45:47.000000000 +0200 -+++ tzdata2009k/africa 2009-08-12 13:56:08.000000000 +0200 -@@ -277,7 +277,7 @@ Rule Egypt 2007 only - Sep Thu>=1 23:00s - # Thursday in September; Egypt is expected to revert to the last Thursday - # in September. - Rule Egypt 2008 only - Aug lastThu 23:00s 0 - --Rule Egypt 2009 max - Sep lastThu 23:00s 0 - -+Rule Egypt 2009 max - Aug 20 24:00 0 - - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Cairo 2:05:00 - LMT 1900 Oct - -Diff finished. Wed Aug 12 13:57:48 2009 From e616db84af17cfbe32d66079e57efb16bc199e88 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 23 Sep 2009 10:40:40 +0000 Subject: [PATCH 094/280] - Upstream 2009m - Palestine will will revert back to winter time on Friday, 2009-09-04 - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010 - Drop Egypt patch --- tzdata-2009m-karachi.patch | 31 +++++++++++++++++++++++++++++++ tzdata.spec | 14 ++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 tzdata-2009m-karachi.patch diff --git a/tzdata-2009m-karachi.patch b/tzdata-2009m-karachi.patch new file mode 100644 index 0000000..d4ecf55 --- /dev/null +++ b/tzdata-2009m-karachi.patch @@ -0,0 +1,31 @@ +diff -up /home/petr/fedora/tzdata/devel/tzdata/tzdata2009m/asia\~ /home/petr/fedora/tzdata/devel/tzdata/tzdata2009m/asia +--- tzdata2009m/asia~ 2009-09-03 16:23:43.000000000 +0200 ++++ tzdata2009m/asia 2009-09-18 13:14:26.000000000 +0200 +@@ -1674,8 +1674,14 @@ Zone Asia/Muscat 3:54:20 - LMT 1920 + # advance clocks in the country by one hour from April 15 to + # conserve energy" + +-# From Arthur David Olson (2009-04-10): +-# Assume for now that Pakistan will end DST in 2009 as it did in 2008. ++# From Steffen Thorsen (2009-09-17): ++# "The News International", Pakistan reports that: "The Federal ++# Government has decided to restore the previous time by moving the ++# clocks backward by one hour from October 1. A formal announcement to ++# this effect will be made after the Prime Minister grants approval in ++# this regard." ++# http://www.thenews.com.pk/updates.asp?id=87168 ++# + + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S +@@ -1683,7 +1689,7 @@ Rule Pakistan 2002 only - Oct Sun>=2 0:0 + Rule Pakistan 2008 only - Jun 1 0:00 1:00 S + Rule Pakistan 2008 only - Nov 1 0:00 0 - + Rule Pakistan 2009 only - Apr 15 0:00 1:00 S +-Rule Pakistan 2009 only - Nov 1 0:00 0 - ++Rule Pakistan 2009 only - Oct 1 0:00 0 - + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Asia/Karachi 4:28:12 - LMT 1907 + 5:30 - IST 1942 Sep + +Diff finished. Fri Sep 18 13:14:30 2009 diff --git a/tzdata.spec b/tzdata.spec index 1560a82..575f2e4 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata Version: 2009m -%define tzdata_version %{version} +%define tzdata_version 2009m %define tzcode_version 2009k -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -16,6 +16,9 @@ Source0: tzdata-base-0.tar.bz2 # These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +# __decl_patches +Patch1: tzdata-2009m-karachi.patch +# __end BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -47,6 +50,9 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig +# __apply_patches +%patch1 -p0 +# __end mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -107,6 +113,10 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Tue Sep 22 2009 Petr Machata - 2009m-2 +- Add markers for autoupdate of spec file +- Pakistan leaves the period of DST on October 1 (tzdata-2009m-karachi.patch) + * Wed Sep 16 2009 Petr Machata - 2009m-1 - Upstream 2009m - Palestine will will revert back to winter time on Friday, 2009-09-04 From 0467c287f61859fb574572484fad797e3a0a44c6 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 19 Oct 2009 15:33:49 +0000 Subject: [PATCH 095/280] - Upstream 2009o - Patch: Argentina doesn't enter DST --- sources | 2 +- tzdata-2009m-karachi.patch | 31 ------------------------------- tzdata-2009o-argentinas.patch | 19 +++++++++++++++++++ tzdata.spec | 15 +++++++++++---- 4 files changed, 31 insertions(+), 36 deletions(-) delete mode 100644 tzdata-2009m-karachi.patch create mode 100644 tzdata-2009o-argentinas.patch diff --git a/sources b/sources index 5a7a1ed..f8e13c0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 d181116286661375966a350e3e358cfa tzcode2009k.tar.gz -5314fe1483c7c1be17c50f2c2171e06b tzdata2009m.tar.gz +75c74b9c8df7c83c8e3c3068fff08a82 tzdata2009o.tar.gz diff --git a/tzdata-2009m-karachi.patch b/tzdata-2009m-karachi.patch deleted file mode 100644 index d4ecf55..0000000 --- a/tzdata-2009m-karachi.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up /home/petr/fedora/tzdata/devel/tzdata/tzdata2009m/asia\~ /home/petr/fedora/tzdata/devel/tzdata/tzdata2009m/asia ---- tzdata2009m/asia~ 2009-09-03 16:23:43.000000000 +0200 -+++ tzdata2009m/asia 2009-09-18 13:14:26.000000000 +0200 -@@ -1674,8 +1674,14 @@ Zone Asia/Muscat 3:54:20 - LMT 1920 - # advance clocks in the country by one hour from April 15 to - # conserve energy" - --# From Arthur David Olson (2009-04-10): --# Assume for now that Pakistan will end DST in 2009 as it did in 2008. -+# From Steffen Thorsen (2009-09-17): -+# "The News International", Pakistan reports that: "The Federal -+# Government has decided to restore the previous time by moving the -+# clocks backward by one hour from October 1. A formal announcement to -+# this effect will be made after the Prime Minister grants approval in -+# this regard." -+# http://www.thenews.com.pk/updates.asp?id=87168 -+# - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S -@@ -1683,7 +1689,7 @@ Rule Pakistan 2002 only - Oct Sun>=2 0:0 - Rule Pakistan 2008 only - Jun 1 0:00 1:00 S - Rule Pakistan 2008 only - Nov 1 0:00 0 - - Rule Pakistan 2009 only - Apr 15 0:00 1:00 S --Rule Pakistan 2009 only - Nov 1 0:00 0 - -+Rule Pakistan 2009 only - Oct 1 0:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Karachi 4:28:12 - LMT 1907 - 5:30 - IST 1942 Sep - -Diff finished. Fri Sep 18 13:14:30 2009 diff --git a/tzdata-2009o-argentinas.patch b/tzdata-2009o-argentinas.patch new file mode 100644 index 0000000..ce0b100 --- /dev/null +++ b/tzdata-2009o-argentinas.patch @@ -0,0 +1,19 @@ +--- tzdata2009o/southamerica~ 2009-10-16 13:23:49.000000000 +0000 ++++ tzdata2009o/southamerica 2009-10-16 13:24:14.000000000 +0000 +@@ -215,9 +215,14 @@ + # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc + # + ++# Margarita Manterola: ++# Same as always, Argentina's government just decided to change its mind ++# regarding DST, 2 days in advance. ++# http://www.lanacion.com.ar/nota.asp?nota_id=1186963&pid=7542694&toi=6275 ++ + Rule Arg 2007 only - Dec 30 0:00 1:00 S +-Rule Arg 2008 max - Mar Sun>=15 0:00 0 - +-Rule Arg 2008 max - Oct Sun>=15 0:00 1:00 S ++Rule Arg 2008 2009 - Mar Sun>=15 0:00 0 - ++Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S + + # From Mariano Absatz (2004-05-21): + # Today it was officially published that the Province of Mendoza is changing diff --git a/tzdata.spec b/tzdata.spec index 575f2e4..5356ef1 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2009m -%define tzdata_version 2009m +Version: 2009o +%define tzdata_version 2009o %define tzcode_version 2009k -Release: 2%{?dist} +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -17,7 +17,7 @@ Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz # __decl_patches -Patch1: tzdata-2009m-karachi.patch +Patch1: tzdata-2009o-argentinas.patch # __end BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -113,6 +113,13 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Oct 19 2009 Petr Machata - 2009o-1 +- Upstream 2009o + - Bangladesh won't go back to Standard Time from October 1, 2009 + - Pakistan leaves DST on October 1, 2009 +- Dropped tzdata-2009m-karachi.patch +- Argentina does not enter DST on October 18 (tzdata-2009o-argentinas.patch) + * Tue Sep 22 2009 Petr Machata - 2009m-2 - Add markers for autoupdate of spec file - Pakistan leaves the period of DST on October 1 (tzdata-2009m-karachi.patch) From fa85600b504c3621db2c2dfab16a5d9de4697dbb Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 21 Oct 2009 14:37:39 +0000 Subject: [PATCH 096/280] - San Luis (Argentina) entered DST on October 11 (tzdata-2009o-argentinas.patch) --- tzdata-2009o-argentinas.patch | 35 ++++++++++++++++++++++++++--------- tzdata.spec | 5 ++++- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/tzdata-2009o-argentinas.patch b/tzdata-2009o-argentinas.patch index ce0b100..aeaab7c 100644 --- a/tzdata-2009o-argentinas.patch +++ b/tzdata-2009o-argentinas.patch @@ -1,14 +1,9 @@ ---- tzdata2009o/southamerica~ 2009-10-16 13:23:49.000000000 +0000 -+++ tzdata2009o/southamerica 2009-10-16 13:24:14.000000000 +0000 -@@ -215,9 +215,14 @@ - # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc +diff -ur tzdata2009n/southamerica tzdata2009n_MODIF/southamerica +--- tzdata2009o/southamerica 2009-09-22 16:13:38.000000000 -0300 ++++ tzdata2009o/southamerica 2009-10-16 13:09:53.000000000 -0300 +@@ -216,8 +216,8 @@ # -+# Margarita Manterola: -+# Same as always, Argentina's government just decided to change its mind -+# regarding DST, 2 days in advance. -+# http://www.lanacion.com.ar/nota.asp?nota_id=1186963&pid=7542694&toi=6275 -+ Rule Arg 2007 only - Dec 30 0:00 1:00 S -Rule Arg 2008 max - Mar Sun>=15 0:00 0 - -Rule Arg 2008 max - Oct Sun>=15 0:00 1:00 S @@ -17,3 +12,25 @@ # From Mariano Absatz (2004-05-21): # Today it was officially published that the Province of Mendoza is changing +@@ -428,6 +428,11 @@ + # "Mar del Plata doesn't want to change the time" + # (less definitive than "is not to"). + ++ ++Rule SanLuis 2008 max - Mar Sun>=8 0:00 0 - ++Rule SanLuis 2008 max - Oct Sun>=8 0:00 1:00 S ++ ++ + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + # + # Buenos Aires (BA), Capital Federal (CF), +@@ -574,8 +579,7 @@ + -3:00 - ART 2004 May 31 + -4:00 - WART 2004 Jul 25 + -3:00 Arg AR%sT 2008 Jan 21 +- -3:00 - ART 2009 Mar 15 +- -4:00 Arg WAR%sT ++ -4:00 SanLuis WAR%sT + # + # Santa Cruz (SC) + Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31 diff --git a/tzdata.spec b/tzdata.spec index 5356ef1..04cd912 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2009o %define tzdata_version 2009o %define tzcode_version 2009k -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -113,6 +113,9 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Wed Oct 21 2009 Petr Machata - 2009o-2 +- San Luis (Argentina) entered DST on October 11 (tzdata-2009o-argentinas.patch) + * Mon Oct 19 2009 Petr Machata - 2009o-1 - Upstream 2009o - Bangladesh won't go back to Standard Time from October 1, 2009 From 9fbea3751199e8aab8cc75bdbb1dfc779d3c91c3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:52:27 +0000 Subject: [PATCH 097/280] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 500754a..bf95f05 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: tzdata -# $Id: Makefile,v 1.1 2004/09/09 13:40:39 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:29:08 notting Exp $ NAME := tzdata SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 44fdb442a03085f167e80759dc8a6fc6b5941a9c Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 4 Jan 2010 14:20:47 +0000 Subject: [PATCH 098/280] - Upstream 2009p - Argentina does not enter DST on October 18 - San Luis switched from UTC-4 to UTC-3 on October 11th - Upstream 2009q - Change DST end in Syria from November 1 to last Friday in October - Changes to past Hong Kong transitions - Kemerovo oblast' in Russia will change current time zone on March 28, 2010. Asia/Novokuznetsk is the new time zone name - Upstream 2009r - Changes to local times of three Australian research stations in Antarctica - Upstream 2009s - Fiji plans to re-introduce DST from November 29th 2009 to April 25th 2010 - Upstream 2009u - Bangladesh changed their clock back to Standard Time on December 31, 2009 - Dropped tzdata-2009o-argentinas.patch --- .cvsignore | 2 ++ sources | 4 ++-- tzdata-2009o-argentinas.patch | 36 ----------------------------------- tzdata.spec | 27 ++++++++++++++++++++------ 4 files changed, 25 insertions(+), 44 deletions(-) delete mode 100644 tzdata-2009o-argentinas.patch diff --git a/.cvsignore b/.cvsignore index b396aa3..7020bba 100644 --- a/.cvsignore +++ b/.cvsignore @@ -31,3 +31,5 @@ tzdata2009j.tar.gz tzdata2009k.tar.gz tzcode2009k.tar.gz tzdata2009m.tar.gz +tzdata2009u.tar.gz +tzcode2009t.tar.gz diff --git a/sources b/sources index f8e13c0..a900467 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -d181116286661375966a350e3e358cfa tzcode2009k.tar.gz -75c74b9c8df7c83c8e3c3068fff08a82 tzdata2009o.tar.gz +91355f66ab9bffe3d450357ff7a1189a tzdata2009u.tar.gz +17fe1e12237b11d490f62dcec4b4bc11 tzcode2009t.tar.gz diff --git a/tzdata-2009o-argentinas.patch b/tzdata-2009o-argentinas.patch deleted file mode 100644 index aeaab7c..0000000 --- a/tzdata-2009o-argentinas.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur tzdata2009n/southamerica tzdata2009n_MODIF/southamerica ---- tzdata2009o/southamerica 2009-09-22 16:13:38.000000000 -0300 -+++ tzdata2009o/southamerica 2009-10-16 13:09:53.000000000 -0300 -@@ -216,8 +216,8 @@ - # - - Rule Arg 2007 only - Dec 30 0:00 1:00 S --Rule Arg 2008 max - Mar Sun>=15 0:00 0 - --Rule Arg 2008 max - Oct Sun>=15 0:00 1:00 S -+Rule Arg 2008 2009 - Mar Sun>=15 0:00 0 - -+Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S - - # From Mariano Absatz (2004-05-21): - # Today it was officially published that the Province of Mendoza is changing -@@ -428,6 +428,11 @@ - # "Mar del Plata doesn't want to change the time" - # (less definitive than "is not to"). - -+ -+Rule SanLuis 2008 max - Mar Sun>=8 0:00 0 - -+Rule SanLuis 2008 max - Oct Sun>=8 0:00 1:00 S -+ -+ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - # - # Buenos Aires (BA), Capital Federal (CF), -@@ -574,8 +579,7 @@ - -3:00 - ART 2004 May 31 - -4:00 - WART 2004 Jul 25 - -3:00 Arg AR%sT 2008 Jan 21 -- -3:00 - ART 2009 Mar 15 -- -4:00 Arg WAR%sT -+ -4:00 SanLuis WAR%sT - # - # Santa Cruz (SC) - Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31 diff --git a/tzdata.spec b/tzdata.spec index 04cd912..ca6486c 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2009o -%define tzdata_version 2009o -%define tzcode_version 2009k -Release: 2%{?dist} +Version: 2009u +%define tzdata_version 2009u +%define tzcode_version 2009t +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -17,7 +17,6 @@ Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz # __decl_patches -Patch1: tzdata-2009o-argentinas.patch # __end BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +50,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig # __apply_patches -%patch1 -p0 # __end mkdir javazic @@ -113,6 +111,23 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Jan 04 2010 Petr Machata - 2009u-1 +- Upstream 2009p + - Argentina does not enter DST on October 18 + - San Luis switched from UTC-4 to UTC-3 on October 11th +- Upstream 2009q + - Change DST end in Syria from November 1 to last Friday in October + - Changes to past Hong Kong transitions + - Kemerovo oblast' in Russia will change current time zone on March 28, 2010. + Asia/Novokuznetsk is the new time zone name +- Upstream 2009r + - Changes to local times of three Australian research stations in Antarctica +- Upstream 2009s + - Fiji plans to re-introduce DST from November 29th 2009 to April 25th 2010 +- Upstream 2009u + - Bangladesh changed their clock back to Standard Time on December 31, 2009 +- Dropped tzdata-2009o-argentinas.patch + * Wed Oct 21 2009 Petr Machata - 2009o-2 - San Luis (Argentina) entered DST on October 11 (tzdata-2009o-argentinas.patch) From ee2e86f32eec027be4cca784ae6cbae526a9d1d3 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 1 Mar 2010 15:10:27 +0000 Subject: [PATCH 099/280] - Upstream 2010a - Source code cleanups - Upstream 2010b - Northern Mexico's border cities share the DST schedule with the United States - Upstream 2010c - Paraguay DST now in effect from 2nd Sunday of April to 1st Sunday of October --- .cvsignore | 2 ++ sources | 4 ++-- tzdata.spec | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7020bba..6ece7eb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -33,3 +33,5 @@ tzcode2009k.tar.gz tzdata2009m.tar.gz tzdata2009u.tar.gz tzcode2009t.tar.gz +tzdata2010c.tar.gz +tzcode2010c.tar.gz diff --git a/sources b/sources index a900467..42597cb 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -91355f66ab9bffe3d450357ff7a1189a tzdata2009u.tar.gz -17fe1e12237b11d490f62dcec4b4bc11 tzcode2009t.tar.gz +6af9fdb979b868be9080da64d53c9be9 tzdata2010c.tar.gz +a3021ce84b46bf57627dade2451949b6 tzcode2010c.tar.gz diff --git a/tzdata.spec b/tzdata.spec index ca6486c..59516b1 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2009u -%define tzdata_version 2009u -%define tzcode_version 2009t +Version: 2010c +%define tzdata_version 2010c +%define tzcode_version 2010c Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -111,6 +111,16 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Mar 01 2010 Petr Machata - 2010c-1 +- Upstream 2010a + - Source code cleanups +- Upstream 2010b + - Northern Mexico's border cities share the DST schedule with the + United States +- Upstream 2010c + - Paraguay DST now in effect from 2nd Sunday of April to 1st Sunday + of October + * Mon Jan 04 2010 Petr Machata - 2009u-1 - Upstream 2009p - Argentina does not enter DST on October 18 From 9e44a7969c30c09a5cbad497b52a28e3858498ad Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 2 Mar 2010 15:53:07 +0000 Subject: [PATCH 100/280] Fix changelog --- tzdata.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/tzdata.spec b/tzdata.spec index 59516b1..1744a6f 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -114,6 +114,7 @@ rm -rf %{buildroot} * Mon Mar 01 2010 Petr Machata - 2010c-1 - Upstream 2010a - Source code cleanups + - Historical timestamps for Bangladesh - Upstream 2010b - Northern Mexico's border cities share the DST schedule with the United States From dd6434ccb7d2286524b598014686bb4c0e5dd1a4 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 9 Mar 2010 13:16:04 +0000 Subject: [PATCH 101/280] - Upstream 2010d - The DST change in Bangladesh takes place a minute earlier - Fiji to end DST on 2010-03-28 at 03:00, about a month earlier - Samoa to observe DST this year; they didn't observe DST last year - DST in Chile extended to 3 April - Upstream 2010e: - Fix a typo in Bangladesh DST rule --- .cvsignore | 1 + sources | 2 +- tzdata.spec | 13 +++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6ece7eb..be1a9b9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -35,3 +35,4 @@ tzdata2009u.tar.gz tzcode2009t.tar.gz tzdata2010c.tar.gz tzcode2010c.tar.gz +tzdata2010e.tar.gz diff --git a/sources b/sources index 42597cb..504ab26 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -6af9fdb979b868be9080da64d53c9be9 tzdata2010c.tar.gz a3021ce84b46bf57627dade2451949b6 tzcode2010c.tar.gz +8e179c56fd18c0f85dfa4ac4bf828b42 tzdata2010e.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 1744a6f..5db0b4c 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata -Version: 2010c -%define tzdata_version 2010c +Version: 2010e +%define tzdata_version 2010e %define tzcode_version 2010c Release: 1%{?dist} License: Public Domain @@ -111,6 +111,15 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Tue Mar 09 2010 Petr Machata - 2010e-1 +- Upstream 2010d + - The DST change in Bangladesh takes place a minute earlier + - Fiji to end DST on 2010-03-28 at 03:00, about a month earlier + - Samoa to observe DST this year; they didn't observe DST last year + - DST in Chile extended to 3 April +- Upstream 2010e: + - Fix a typo in Bangladesh DST rule + * Mon Mar 01 2010 Petr Machata - 2010c-1 - Upstream 2010a - Source code cleanups From 99b3afcdd5e3470ba55526955da6beb98af835f7 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 25 Mar 2010 14:12:27 +0000 Subject: [PATCH 102/280] - Upstream 2010f: - Changes to Australian stations in Antarctica - Correct 2010 Samoa DST start date - New zone Antarctica/Macquarie - Change Syria DST start from last Friday in March to first Friday in April in 2010 and forward - Upstream 2010g proposal (tzdata-2010f-g.patch): - No Bangladesh DST in 2010 and forward. - Gaza DST starts last Saturday in March at 12:01 a.m. in 2010 and forward - Kamchatka and Anadyr change to Moscow+8 on 2010-03-28 - Samara changes to Moscow+0 on 2010-03-28 - Related zone.tab updates --- .cvsignore | 2 + sources | 4 +- tzdata-2010f-g.patch | 274 +++++++++++++++++++++++++++++++++++++++++++ tzdata.spec | 23 +++- 4 files changed, 298 insertions(+), 5 deletions(-) create mode 100644 tzdata-2010f-g.patch diff --git a/.cvsignore b/.cvsignore index be1a9b9..194104b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -36,3 +36,5 @@ tzcode2009t.tar.gz tzdata2010c.tar.gz tzcode2010c.tar.gz tzdata2010e.tar.gz +tzcode2010f.tar.gz +tzdata2010f.tar.gz diff --git a/sources b/sources index 504ab26..2f5f3bf 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -a3021ce84b46bf57627dade2451949b6 tzcode2010c.tar.gz -8e179c56fd18c0f85dfa4ac4bf828b42 tzdata2010e.tar.gz +e530cc9bbdfd5e8c1eac21a68f4d5656 tzcode2010f.tar.gz +4a0e2a3594210fafc5c55b5247018618 tzdata2010f.tar.gz diff --git a/tzdata-2010f-g.patch b/tzdata-2010f-g.patch new file mode 100644 index 0000000..b54b2e2 --- /dev/null +++ b/tzdata-2010f-g.patch @@ -0,0 +1,274 @@ +Below are proposed time zone package changes; here's the executive summary: + asia No Bangladesh DST in 2010 and forward. + Gaza DST starts last Saturday in March at 12:01 a.m. + in 2010 and forward. + europe Kamchaatka changes to Moscow+8 on 2010-03-28. + Anadyr changes to Moscow+8 on 2010-03-28. + Samara changes to Moscow on 2010-03-28. + zone.tab Kamchatka changes to Moscow+8. + Anadyr changes to Moscow+8. + Samara changes to Moscow. + +(Note that Kemerovo changes were made previously and that, for time zone +purposes, Udmurt is included within Samara.) + +If no problems are found, these will appear on the ftp site on 2010-03-29. + + --ado + +diff -r -c old/asia new/asia +*** old/asia Wed Mar 17 10:33:04 2010 +--- new/asia Wed Mar 24 10:51:17 2010 +*************** +*** 1,4 **** +! # @(#)asia 8.56 + # This file is in the public domain, so clarified as of + # 2009-05-17 by Arthur David Olson. + +--- 1,4 ---- +! # @(#)asia 8.58 + # This file is in the public domain, so clarified as of + # 2009-05-17 by Arthur David Olson. + +*************** +*** 214,255 **** + # 2010 midnight. The decision came at a cabinet meeting at the Prime + # Minister's Office last night..." + +! # From Danvin Ruangchan (2009-12-24): +! # ...the news mentions DST will be turned off again 7 months after March +! # 31st on Oct 31, 2010. +! +! # From Arthur David Olson (2009-12-26): +! # Indeed, "The government will advance again the Banglasdesh Standard +! # Time by one one hour on March 31 next year by enforcing the Daylight +! # Saving Time (DST) for seven months. It will continue till October 31 +! # until further notice." I take that last sentence as the +! # establishment of a rule. +! +! # From Nobutomo Nakano (2010-02-19): +! # We received a report from Bangladesh saying that the start/end of +! # Bangladesh DST is incorrect. Currently we have only the Bengali version +! # of the official mail from BTRC which describes the following: +! # +! # "From 2010 each year when local standard time is about to reach +! # March 31 at 10:59:00 PM clocks are turned forward 1 hour (11:59:00 PM) +! # and when local daylight time is about to October 31 at 11:59:00 PM +! # clocks are turned backward 1 hour (10:59:00 PM)." +! # +! # So, DST will start/end 1 minute earlier. +! +! # From Arthur David Olson (2010-03-03): +! # The file +! # +! # http://www.cabinet.gov/bd/file_upload/news_events/en_169.pdf + # +! # is in Bengali; it does contain two "31"s as well as two "11.59"s and a "10.59" +! # which is consistent with the information provided by Nobutomo Nakano. + + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule Dhaka 2009 only - Jun 19 23:00 1:00 S + Rule Dhaka 2009 only - Dec 31 23:59 0 - +- Rule Dhaka 2010 max - Mar 31 22:59 1:00 S +- Rule Dhaka 2010 max - Oct 31 23:59 0 - + + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Asia/Dhaka 6:01:40 - LMT 1890 +--- 214,233 ---- + # 2010 midnight. The decision came at a cabinet meeting at the Prime + # Minister's Office last night..." + +! # From Alexander Krivenyshev (2010-03-22): +! # According to Bangladesh newspaper "The Daily Star," +! # Cabinet cancels Daylight Saving Time +! # +! # http://www.thedailystar.net/newDesign/latest_news.php?nid=22817 + # +! # or +! # +! # http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html +! # + + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule Dhaka 2009 only - Jun 19 23:00 1:00 S + Rule Dhaka 2009 only - Dec 31 23:59 0 - + + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Asia/Dhaka 6:01:40 - LMT 1890 +*************** +*** 2129,2134 **** +--- 2107,2138 ---- + # http://www.worldtimezone.com/dst_news/dst_news_gazastrip02.html + # + ++ # From Alexander Krivenyshev (2010-03-19): ++ # According to Voice of Palestine DST will last for 191 days, from March ++ # 26, 2010 till "the last Sunday before the tenth day of Tishri ++ # (October), each year" (October 03, 2010?) ++ # ++ # ++ # http://palvoice.org/forums/showthread.php?t=245697 ++ # ++ # (in Arabic) ++ # or ++ # ++ # http://www.worldtimezone.com/dst_news/dst_news_westbank03.html ++ # ++ ++ # From Steffen Thorsen (2010-03-24): ++ # ...Ma'an News Agency reports that Hamas cabinet has decided it will ++ # start one day later, at 12:01am. Not sure if they really mean 12:01am or ++ # noon though: ++ # ++ # ++ # http://www.maannews.net/eng/ViewDetails.aspx?ID=271178 ++ # ++ # (Ma'an News Agency) ++ # "At 12:01am Friday, clocks in Israel and the West Bank will change to ++ # 1:01am, while Gaza clocks will change at 12:01am Saturday morning." ++ + # The rules for Egypt are stolen from the `africa' file. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule EgyptAsia 1957 only - May 10 0:00 1:00 S +*************** +*** 2146,2152 **** + Rule Palestine 2006 only - Sep 22 0:00 0 - + Rule Palestine 2007 only - Sep Thu>=8 2:00 0 - + Rule Palestine 2008 only - Aug lastFri 2:00 0 - +! Rule Palestine 2009 max - Mar lastFri 0:00 1:00 S + Rule Palestine 2009 max - Sep Fri>=1 2:00 0 - + + # Zone NAME GMTOFF RULES FORMAT [UNTIL] +--- 2150,2157 ---- + Rule Palestine 2006 only - Sep 22 0:00 0 - + Rule Palestine 2007 only - Sep Thu>=8 2:00 0 - + Rule Palestine 2008 only - Aug lastFri 2:00 0 - +! Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S +! Rule Palestine 2010 max - Mar lastSat 0:01 1:00 S + Rule Palestine 2009 max - Sep Fri>=1 2:00 0 - + + # Zone NAME GMTOFF RULES FORMAT [UNTIL] +diff -r -c old/europe new/europe +*** old/europe Wed Jan 6 10:21:33 2010 +--- new/europe Wed Mar 24 11:14:53 2010 +*************** +*** 1,5 **** + # 
+! # @(#)europe	8.25
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
+! # @(#)europe	8.26
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 2041,2047 ****
+  			 3:00	Russia	KUY%sT	1991 Mar 31 2:00s
+  			 2:00	Russia	KUY%sT	1991 Sep 29 2:00s
+  			 3:00	-	KUYT	1991 Oct 20 3:00
+! 			 4:00	Russia	SAM%sT	# Samara Time
+  #
+  # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+  # Respublika Bashkortostan, Komi-Permyatskij avtonomnyj okrug,
+--- 2041,2049 ----
+  			 3:00	Russia	KUY%sT	1991 Mar 31 2:00s
+  			 2:00	Russia	KUY%sT	1991 Sep 29 2:00s
+  			 3:00	-	KUYT	1991 Oct 20 3:00
+! 			 4:00	Russia	SAM%sT	2010 Mar 28 2:00s # Samara Time
+! 			 3:00	Russia	SAM%sT
+! 
+  #
+  # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+  # Respublika Bashkortostan, Komi-Permyatskij avtonomnyj okrug,
+***************
+*** 2194,2200 ****
+  			11:00	-	PETT	1930 Jun 21 # P-K Time
+  			12:00	Russia	PET%sT	1991 Mar 31 2:00s
+  			11:00	Russia	PET%sT	1992 Jan 19 2:00s
+! 			12:00	Russia	PET%sT
+  #
+  # Chukotskij avtonomnyj okrug
+  Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
+--- 2196,2203 ----
+  			11:00	-	PETT	1930 Jun 21 # P-K Time
+  			12:00	Russia	PET%sT	1991 Mar 31 2:00s
+  			11:00	Russia	PET%sT	1992 Jan 19 2:00s
+! 			12:00	Russia	PET%sT	2010 Mar 28 2:00s
+! 			11:00	Russia	PET%sT
+  #
+  # Chukotskij avtonomnyj okrug
+  Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
+***************
+*** 2202,2208 ****
+  			13:00	Russia	ANA%sT	1982 Apr  1 0:00s
+  			12:00	Russia	ANA%sT	1991 Mar 31 2:00s
+  			11:00	Russia	ANA%sT	1992 Jan 19 2:00s
+! 			12:00	Russia	ANA%sT
+  
+  # Serbia
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+--- 2205,2212 ----
+  			13:00	Russia	ANA%sT	1982 Apr  1 0:00s
+  			12:00	Russia	ANA%sT	1991 Mar 31 2:00s
+  			11:00	Russia	ANA%sT	1992 Jan 19 2:00s
+! 			12:00	Russia	ANA%sT	2010 Mar 28 2:00s
+! 			11:00	Russia	ANA%sT
+  
+  # Serbia
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+diff -r -c old/zone.tab new/zone.tab
+*** old/zone.tab	Wed Mar 17 11:01:07 2010
+--- new/zone.tab	Wed Mar 24 11:14:53 2010
+***************
+*** 1,5 ****
+  # 
+! # @(#)zone.tab	8.34
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  #
+--- 1,5 ----
+  # 
+! # @(#)zone.tab	8.35
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  #
+***************
+*** 330,336 ****
+  RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+  RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
+  RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+! RU	+5312+05009	Europe/Samara	Moscow+01 - Samara, Udmurtia
+  RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+  RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+  RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+--- 330,336 ----
+  RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+  RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
+  RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+! RU	+5312+05009	Europe/Samara	Moscow - Samara, Udmurtia
+  RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+  RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+  RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+***************
+*** 341,348 ****
+  RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+  RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+  RU	+5934+15048	Asia/Magadan	Moscow+08 - Magadan
+! RU	+5301+15839	Asia/Kamchatka	Moscow+09 - Kamchatka
+! RU	+6445+17729	Asia/Anadyr	Moscow+10 - Bering Sea
+  RW	-0157+03004	Africa/Kigali
+  SA	+2438+04643	Asia/Riyadh
+  SB	-0932+16012	Pacific/Guadalcanal
+--- 341,348 ----
+  RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+  RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+  RU	+5934+15048	Asia/Magadan	Moscow+08 - Magadan
+! RU	+5301+15839	Asia/Kamchatka	Moscow+08 - Kamchatka
+! RU	+6445+17729	Asia/Anadyr	Moscow+08 - Bering Sea
+  RW	-0157+03004	Africa/Kigali
+  SA	+2438+04643	Asia/Riyadh
+  SB	-0932+16012	Pacific/Guadalcanal
+
diff --git a/tzdata.spec b/tzdata.spec
index 5db0b4c..0ac1f8f 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010e
-%define tzdata_version 2010e
-%define tzcode_version 2010c
+Version: 2010f
+%define tzdata_version 2010f
+%define tzcode_version 2010f
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -17,6 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
+Patch1: tzdata-2010f-g.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
+%patch1 -p1
 # __end
 
 mkdir javazic
@@ -111,6 +113,21 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Mar 25 2010 Petr Machata  - 2010f-1
+- Upstream 2010f:
+  - Changes to Australian stations in Antarctica
+  - Correct 2010 Samoa DST start date
+  - New zone Antarctica/Macquarie
+  - Change Syria DST start from last Friday in March to first Friday
+    in April in 2010 and forward
+- Upstream 2010g proposal (tzdata-2010f-g.patch):
+  - No Bangladesh DST in 2010 and forward.
+  - Gaza DST starts last Saturday in March at 12:01 a.m. in 2010 and forward
+  - Kamchatka and Anadyr change to Moscow+8 on 2010-03-28
+  - Samara changes to Moscow+0 on 2010-03-28
+  - Related zone.tab updates
+
+
 * Tue Mar 09 2010 Petr Machata  - 2010e-1
 - Upstream 2010d
   - The DST change in Bangladesh takes place a minute earlier

From 8119cee05d44176392c7127fadb16243d77ffbd4 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Thu, 25 Mar 2010 14:41:31 +0000
Subject: [PATCH 103/280] - Fix the path in tzdata-2010f-g.patch

---
 tzdata-2010f-g.patch | 12 ++++++------
 tzdata.spec          |  7 +++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tzdata-2010f-g.patch b/tzdata-2010f-g.patch
index b54b2e2..70d20d7 100644
--- a/tzdata-2010f-g.patch
+++ b/tzdata-2010f-g.patch
@@ -17,8 +17,8 @@ If no problems are found, these will appear on the ftp site on 2010-03-29.
 				--ado
 
 diff -r -c old/asia new/asia
-*** old/asia	Wed Mar 17 10:33:04 2010
---- new/asia	Wed Mar 24 10:51:17 2010
+*** tzdata2010f/asia	Wed Mar 17 10:33:04 2010
+--- tzdata2010f/asia	Wed Mar 24 10:51:17 2010
 ***************
 *** 1,4 ****
 ! # @(#)asia	8.56
@@ -149,8 +149,8 @@ diff -r -c old/asia new/asia
   
   # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 diff -r -c old/europe new/europe
-*** old/europe	Wed Jan  6 10:21:33 2010
---- new/europe	Wed Mar 24 11:14:53 2010
+*** tzdata2010f/europe	Wed Jan  6 10:21:33 2010
+--- tzdata2010f/europe	Wed Mar 24 11:14:53 2010
 ***************
 *** 1,5 ****
   # 
@@ -220,8 +220,8 @@ diff -r -c old/europe new/europe
   # Serbia
   # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 diff -r -c old/zone.tab new/zone.tab
-*** old/zone.tab	Wed Mar 17 11:01:07 2010
---- new/zone.tab	Wed Mar 24 11:14:53 2010
+*** tzdata2010f/zone.tab	Wed Mar 17 11:01:07 2010
+--- tzdata2010f/zone.tab	Wed Mar 24 11:14:53 2010
 ***************
 *** 1,5 ****
   # 
diff --git a/tzdata.spec b/tzdata.spec
index 0ac1f8f..c111f4e 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2010f
 %define tzdata_version 2010f
 %define tzcode_version 2010f
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -51,7 +51,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
-%patch1 -p1
+%patch1 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +113,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Mar 25 2010 Petr Machata  - 2010f-2
+- Fix the path in tzdata-2010f-g.patch
+
 * Thu Mar 25 2010 Petr Machata  - 2010f-1
 - Upstream 2010f:
   - Changes to Australian stations in Antarctica

From 541fcacb02512b47087b906ecfd83d23126f434d Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 29 Mar 2010 13:35:33 +0000
Subject: [PATCH 104/280] - Tunisia not to observe DST in 2010
 (tzdata-2010g-tunis.patch) - Pakistan not to observe DST in 2010
 (tzdata-2010g-karachi.patch)

---
 tzdata-2010g-karachi.patch | 26 ++++++++++++++++++++++++++
 tzdata-2010g-tunis.patch   | 21 +++++++++++++++++++++
 tzdata.spec                | 10 +++++++++-
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2010g-karachi.patch
 create mode 100644 tzdata-2010g-tunis.patch

diff --git a/tzdata-2010g-karachi.patch b/tzdata-2010g-karachi.patch
new file mode 100644
index 0000000..f706694
--- /dev/null
+++ b/tzdata-2010g-karachi.patch
@@ -0,0 +1,26 @@
+diff --git a/asia b/asia
+index 859d9c5..cd333c4 100644
+--- tzdata2010f/asia
++++ tzdata2010f/asia
+@@ -1934,13 +1934,19 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
+ # [T]he German Consulate General in Karachi reported me today that Pakistan
+ # will go back to standard time on 1st of November.
+ 
++# The government has reversed the plan to advance clocks from April 1 [2010].
++# Prime Minister Yousuf Raza Gilani said in the National Assembly
++# session that government will honour House' view and would not
++# advance the clocks.
++# http://www.apakistannews.com/govt-withdraws-plan-to-advance-clocks-172041
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
+ Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
+ Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
+ Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
+-Rule Pakistan	2009	max	-	Apr	15	0:00	1:00	S
+-Rule Pakistan	2009	max	-	Nov	1	0:00	0	-
++Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
++Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Karachi	4:28:12 -	LMT	1907
+ 			5:30	-	IST	1942 Sep
diff --git a/tzdata-2010g-tunis.patch b/tzdata-2010g-tunis.patch
new file mode 100644
index 0000000..4761ab0
--- /dev/null
+++ b/tzdata-2010g-tunis.patch
@@ -0,0 +1,21 @@
+diff --git a/africa b/africa
+index ad89bb7..d94bd70 100644
+--- tzdata2010f/africa
++++ tzdata2010f/africa
+@@ -940,7 +940,6 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
+ # The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
+ # that the fasting month of ramadan coincides with the period concerned by summer time.
+ # Therefore, the standard time will be kept unchanged the whole year long."
+-# So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Tunisia	1939	only	-	Apr	15	23:00s	1:00	S
+@@ -968,8 +967,6 @@ Rule	Tunisia	2005	only	-	May	 1	 0:00s	1:00	S
+ Rule	Tunisia	2005	only	-	Sep	30	 1:00s	0	-
+ Rule	Tunisia	2006	2008	-	Mar	lastSun	 2:00s	1:00	S
+ Rule	Tunisia	2006	2008	-	Oct	lastSun	 2:00s	0	-
+-Rule	Tunisia	2010	max	-	Mar	lastSun	 2:00s	1:00	S
+-Rule	Tunisia	2010	max	-	Oct	lastSun	 2:00s	0	-
+ # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
+ # more precise 0:09:21.
+ # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
diff --git a/tzdata.spec b/tzdata.spec
index c111f4e..58946a5 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2010f
 %define tzdata_version 2010f
 %define tzcode_version 2010f
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -18,6 +18,8 @@ Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2010f-g.patch
+Patch2: tzdata-2010g-karachi.patch
+Patch3: tzdata-2010g-tunis.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +54,8 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
+%patch3 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +117,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Mar 29 2010 Petr Machata  - 2010f-3
+- Tunisia not to observe DST in 2010 (tzdata-2010g-tunis.patch)
+- Pakistan not to observe DST in 2010 (tzdata-2010g-karachi.patch)
+
 * Thu Mar 25 2010 Petr Machata  - 2010f-2
 - Fix the path in tzdata-2010f-g.patch
 

From 1c52f423b292075080599e0c88038032e79bcc86 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 6 Apr 2010 14:13:12 +0000
Subject: [PATCH 105/280] - Upstream 2010g: - No Bangladesh DST in 2010 and
 forward. - Gaza DST starts last Saturday in March at 12:01 a.m. in 2010 and
 forward - Kamchatka and Anadyr change to Moscow+8 on 2010-03-28 - Samara
 changes to Moscow+0 on 2010-03-28 - Related zone.tab updates - Upstream
 2010h: - No DST in Tunisia in 2010 and forward - No DST in Pakistan in 2010
 and forward - Dropped tzdata-2010g-tunis.patch - Dropped tzdata-2010f-g.patch
 - Dropped tzdata-2010g-karachi.patch

---
 .cvsignore                 |   1 +
 sources                    |   3 +-
 tzdata-2010f-g.patch       | 274 -------------------------------------
 tzdata-2010g-karachi.patch |  26 ----
 tzdata-2010g-tunis.patch   |  21 ---
 tzdata.spec                |  27 ++--
 6 files changed, 20 insertions(+), 332 deletions(-)
 delete mode 100644 tzdata-2010f-g.patch
 delete mode 100644 tzdata-2010g-karachi.patch
 delete mode 100644 tzdata-2010g-tunis.patch

diff --git a/.cvsignore b/.cvsignore
index 194104b..57602d8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -38,3 +38,4 @@ tzcode2010c.tar.gz
 tzdata2010e.tar.gz
 tzcode2010f.tar.gz
 tzdata2010f.tar.gz
+tzdata2010h.tar.gz
diff --git a/sources b/sources
index 2f5f3bf..43e4048 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-e530cc9bbdfd5e8c1eac21a68f4d5656  tzcode2010f.tar.gz
-4a0e2a3594210fafc5c55b5247018618  tzdata2010f.tar.gz
+d384ac091e6d56802f9b3e6b3d3f0f2e  tzdata2010h.tar.gz
diff --git a/tzdata-2010f-g.patch b/tzdata-2010f-g.patch
deleted file mode 100644
index 70d20d7..0000000
--- a/tzdata-2010f-g.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-Below are proposed time zone package changes; here's the executive summary:
-	asia		No Bangladesh DST in 2010 and forward.
-			Gaza DST starts last Saturday in March at 12:01 a.m.
-			in 2010 and forward.
-	europe		Kamchaatka changes to Moscow+8 on 2010-03-28.
-			Anadyr changes to Moscow+8 on 2010-03-28.
-			Samara changes to Moscow on 2010-03-28.
-	zone.tab	Kamchatka changes to Moscow+8.
-			Anadyr changes to Moscow+8.
-			Samara changes to Moscow.
-
-(Note that Kemerovo changes were made previously and that, for time zone
-purposes, Udmurt is included within Samara.)
-
-If no problems are found, these will appear on the ftp site on 2010-03-29.
-
-				--ado
-
-diff -r -c old/asia new/asia
-*** tzdata2010f/asia	Wed Mar 17 10:33:04 2010
---- tzdata2010f/asia	Wed Mar 24 10:51:17 2010
-***************
-*** 1,4 ****
-! # @(#)asia	8.56
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,4 ----
-! # @(#)asia	8.58
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 214,255 ****
-  # 2010 midnight. The decision came at a cabinet meeting at the Prime
-  # Minister's Office last night..."
-  
-! # From Danvin Ruangchan (2009-12-24):
-! # ...the news mentions DST will be turned off again 7 months after March
-! # 31st on Oct 31, 2010.
-! 
-! # From Arthur David Olson (2009-12-26):
-! # Indeed, "The government will advance again the Banglasdesh Standard
-! # Time by one one hour on March 31 next year by enforcing the Daylight
-! # Saving Time (DST) for seven months. It will continue till October 31
-! # until further notice." I take that last sentence as the
-! # establishment of a rule.
-! 
-! # From Nobutomo Nakano (2010-02-19):
-! # We received a report from Bangladesh saying that the start/end of
-! # Bangladesh DST is incorrect. Currently we have only the Bengali version
-! # of the official mail from BTRC which describes the following:
-! #
-! # "From 2010 each year when local standard time is about to reach
-! # March 31 at 10:59:00 PM clocks are turned forward 1 hour (11:59:00 PM)
-! # and when local daylight time is about to October 31 at 11:59:00 PM
-! # clocks are turned backward 1 hour (10:59:00 PM)."
-! #
-! # So, DST will start/end 1 minute earlier.
-! 
-! # From Arthur David Olson (2010-03-03):
-! # The file
-! # 
-! # http://www.cabinet.gov/bd/file_upload/news_events/en_169.pdf
-  # 
-! # is in Bengali; it does contain two "31"s as well as two "11.59"s and a "10.59"
-! # which is consistent with the information provided by Nobutomo Nakano.
-  
-  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-  Rule	Dhaka	2009	only	-	Jun	19	23:00	1:00	S
-  Rule	Dhaka	2009	only	-	Dec	31	23:59	0	-
-- Rule	Dhaka	2010	max	-	Mar	31	22:59	1:00	S
-- Rule	Dhaka	2010	max	-	Oct	31	23:59	0	-
-  
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone	Asia/Dhaka	6:01:40 -	LMT	1890
---- 214,233 ----
-  # 2010 midnight. The decision came at a cabinet meeting at the Prime
-  # Minister's Office last night..."
-  
-! # From Alexander Krivenyshev (2010-03-22):
-! # According to Bangladesh newspaper "The Daily Star,"
-! # Cabinet cancels Daylight Saving Time 
-! # 
-! # http://www.thedailystar.net/newDesign/latest_news.php?nid=22817
-  # 
-! # or
-! # 
-! # http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
-! # 
-  
-  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-  Rule	Dhaka	2009	only	-	Jun	19	23:00	1:00	S
-  Rule	Dhaka	2009	only	-	Dec	31	23:59	0	-
-  
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone	Asia/Dhaka	6:01:40 -	LMT	1890
-***************
-*** 2129,2134 ****
---- 2107,2138 ----
-  # http://www.worldtimezone.com/dst_news/dst_news_gazastrip02.html
-  # 
-  
-+ # From Alexander Krivenyshev (2010-03-19):
-+ # According to Voice of Palestine DST will last for 191 days, from March
-+ # 26, 2010 till "the last Sunday before the tenth day of Tishri
-+ # (October), each year" (October 03, 2010?)
-+ #
-+ # 
-+ # http://palvoice.org/forums/showthread.php?t=245697
-+ # 
-+ # (in Arabic)
-+ # or
-+ # 
-+ # http://www.worldtimezone.com/dst_news/dst_news_westbank03.html
-+ # 
-+ 
-+ # From Steffen Thorsen (2010-03-24):
-+ # ...Ma'an News Agency reports that Hamas cabinet has decided it will
-+ # start one day later, at 12:01am. Not sure if they really mean 12:01am or
-+ # noon though:
-+ #
-+ # 
-+ # http://www.maannews.net/eng/ViewDetails.aspx?ID=271178
-+ # 
-+ # (Ma'an News Agency)
-+ # "At 12:01am Friday, clocks in Israel and the West Bank will change to
-+ # 1:01am, while Gaza clocks will change at 12:01am Saturday morning."
-+ 
-  # The rules for Egypt are stolen from the `africa' file.
-  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-  Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
-***************
-*** 2146,2152 ****
-  Rule Palestine	2006	only	-	Sep	22	0:00	0	-
-  Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
-  Rule Palestine	2008	only	-	Aug	lastFri	2:00	0	-
-! Rule Palestine	2009	max	-	Mar	lastFri	0:00	1:00	S
-  Rule Palestine	2009	max	-	Sep	Fri>=1	2:00	0	-
-  
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
---- 2150,2157 ----
-  Rule Palestine	2006	only	-	Sep	22	0:00	0	-
-  Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
-  Rule Palestine	2008	only	-	Aug	lastFri	2:00	0	-
-! Rule Palestine	2009	only	-	Mar	lastFri	0:00	1:00	S
-! Rule Palestine	2010	max	-	Mar	lastSat	0:01	1:00	S
-  Rule Palestine	2009	max	-	Sep	Fri>=1	2:00	0	-
-  
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-diff -r -c old/europe new/europe
-*** tzdata2010f/europe	Wed Jan  6 10:21:33 2010
---- tzdata2010f/europe	Wed Mar 24 11:14:53 2010
-***************
-*** 1,5 ****
-  # 
-! # @(#)europe	8.25
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
-! # @(#)europe	8.26
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 2041,2047 ****
-  			 3:00	Russia	KUY%sT	1991 Mar 31 2:00s
-  			 2:00	Russia	KUY%sT	1991 Sep 29 2:00s
-  			 3:00	-	KUYT	1991 Oct 20 3:00
-! 			 4:00	Russia	SAM%sT	# Samara Time
-  #
-  # From Oscar van Vlijmen (2001-08-25): [This region consists of]
-  # Respublika Bashkortostan, Komi-Permyatskij avtonomnyj okrug,
---- 2041,2049 ----
-  			 3:00	Russia	KUY%sT	1991 Mar 31 2:00s
-  			 2:00	Russia	KUY%sT	1991 Sep 29 2:00s
-  			 3:00	-	KUYT	1991 Oct 20 3:00
-! 			 4:00	Russia	SAM%sT	2010 Mar 28 2:00s # Samara Time
-! 			 3:00	Russia	SAM%sT
-! 
-  #
-  # From Oscar van Vlijmen (2001-08-25): [This region consists of]
-  # Respublika Bashkortostan, Komi-Permyatskij avtonomnyj okrug,
-***************
-*** 2194,2200 ****
-  			11:00	-	PETT	1930 Jun 21 # P-K Time
-  			12:00	Russia	PET%sT	1991 Mar 31 2:00s
-  			11:00	Russia	PET%sT	1992 Jan 19 2:00s
-! 			12:00	Russia	PET%sT
-  #
-  # Chukotskij avtonomnyj okrug
-  Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
---- 2196,2203 ----
-  			11:00	-	PETT	1930 Jun 21 # P-K Time
-  			12:00	Russia	PET%sT	1991 Mar 31 2:00s
-  			11:00	Russia	PET%sT	1992 Jan 19 2:00s
-! 			12:00	Russia	PET%sT	2010 Mar 28 2:00s
-! 			11:00	Russia	PET%sT
-  #
-  # Chukotskij avtonomnyj okrug
-  Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
-***************
-*** 2202,2208 ****
-  			13:00	Russia	ANA%sT	1982 Apr  1 0:00s
-  			12:00	Russia	ANA%sT	1991 Mar 31 2:00s
-  			11:00	Russia	ANA%sT	1992 Jan 19 2:00s
-! 			12:00	Russia	ANA%sT
-  
-  # Serbia
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
---- 2205,2212 ----
-  			13:00	Russia	ANA%sT	1982 Apr  1 0:00s
-  			12:00	Russia	ANA%sT	1991 Mar 31 2:00s
-  			11:00	Russia	ANA%sT	1992 Jan 19 2:00s
-! 			12:00	Russia	ANA%sT	2010 Mar 28 2:00s
-! 			11:00	Russia	ANA%sT
-  
-  # Serbia
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-diff -r -c old/zone.tab new/zone.tab
-*** tzdata2010f/zone.tab	Wed Mar 17 11:01:07 2010
---- tzdata2010f/zone.tab	Wed Mar 24 11:14:53 2010
-***************
-*** 1,5 ****
-  # 
-! # @(#)zone.tab	8.34
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
---- 1,5 ----
-  # 
-! # @(#)zone.tab	8.35
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
-***************
-*** 330,336 ****
-  RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
-  RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
-  RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
-! RU	+5312+05009	Europe/Samara	Moscow+01 - Samara, Udmurtia
-  RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
-  RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
-  RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
---- 330,336 ----
-  RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
-  RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
-  RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
-! RU	+5312+05009	Europe/Samara	Moscow - Samara, Udmurtia
-  RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
-  RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
-  RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
-***************
-*** 341,348 ****
-  RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
-  RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
-  RU	+5934+15048	Asia/Magadan	Moscow+08 - Magadan
-! RU	+5301+15839	Asia/Kamchatka	Moscow+09 - Kamchatka
-! RU	+6445+17729	Asia/Anadyr	Moscow+10 - Bering Sea
-  RW	-0157+03004	Africa/Kigali
-  SA	+2438+04643	Asia/Riyadh
-  SB	-0932+16012	Pacific/Guadalcanal
---- 341,348 ----
-  RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
-  RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
-  RU	+5934+15048	Asia/Magadan	Moscow+08 - Magadan
-! RU	+5301+15839	Asia/Kamchatka	Moscow+08 - Kamchatka
-! RU	+6445+17729	Asia/Anadyr	Moscow+08 - Bering Sea
-  RW	-0157+03004	Africa/Kigali
-  SA	+2438+04643	Asia/Riyadh
-  SB	-0932+16012	Pacific/Guadalcanal
-
diff --git a/tzdata-2010g-karachi.patch b/tzdata-2010g-karachi.patch
deleted file mode 100644
index f706694..0000000
--- a/tzdata-2010g-karachi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/asia b/asia
-index 859d9c5..cd333c4 100644
---- tzdata2010f/asia
-+++ tzdata2010f/asia
-@@ -1934,13 +1934,19 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
- # [T]he German Consulate General in Karachi reported me today that Pakistan
- # will go back to standard time on 1st of November.
- 
-+# The government has reversed the plan to advance clocks from April 1 [2010].
-+# Prime Minister Yousuf Raza Gilani said in the National Assembly
-+# session that government will honour House' view and would not
-+# advance the clocks.
-+# http://www.apakistannews.com/govt-withdraws-plan-to-advance-clocks-172041
-+
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
- Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
- Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
- Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
- Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
--Rule Pakistan	2009	max	-	Apr	15	0:00	1:00	S
--Rule Pakistan	2009	max	-	Nov	1	0:00	0	-
-+Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
-+Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Karachi	4:28:12 -	LMT	1907
- 			5:30	-	IST	1942 Sep
diff --git a/tzdata-2010g-tunis.patch b/tzdata-2010g-tunis.patch
deleted file mode 100644
index 4761ab0..0000000
--- a/tzdata-2010g-tunis.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/africa b/africa
-index ad89bb7..d94bd70 100644
---- tzdata2010f/africa
-+++ tzdata2010f/africa
-@@ -940,7 +940,6 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
- # The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
- # that the fasting month of ramadan coincides with the period concerned by summer time.
- # Therefore, the standard time will be kept unchanged the whole year long."
--# So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
- 
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
- Rule	Tunisia	1939	only	-	Apr	15	23:00s	1:00	S
-@@ -968,8 +967,6 @@ Rule	Tunisia	2005	only	-	May	 1	 0:00s	1:00	S
- Rule	Tunisia	2005	only	-	Sep	30	 1:00s	0	-
- Rule	Tunisia	2006	2008	-	Mar	lastSun	 2:00s	1:00	S
- Rule	Tunisia	2006	2008	-	Oct	lastSun	 2:00s	0	-
--Rule	Tunisia	2010	max	-	Mar	lastSun	 2:00s	1:00	S
--Rule	Tunisia	2010	max	-	Oct	lastSun	 2:00s	0	-
- # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
- # more precise 0:09:21.
- # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
diff --git a/tzdata.spec b/tzdata.spec
index 58946a5..9e70718 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010f
-%define tzdata_version 2010f
+Version: 2010h
+%define tzdata_version 2010h
 %define tzcode_version 2010f
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,9 +17,6 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2010f-g.patch
-Patch2: tzdata-2010g-karachi.patch
-Patch3: tzdata-2010g-tunis.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,9 +50,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
 # __end
 
 mkdir javazic
@@ -117,6 +111,21 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Apr 06 2010 Petr Machata  - 2010h-1
+- Upstream 2010g:
+  - No Bangladesh DST in 2010 and forward.
+  - Gaza DST starts last Saturday in March at 12:01 a.m. in 2010 and forward
+  - Kamchatka and Anadyr change to Moscow+8 on 2010-03-28
+  - Samara changes to Moscow+0 on 2010-03-28
+  - Related zone.tab updates
+- Upstream 2010h:
+  - No DST in Tunisia in 2010 and forward
+  - No DST in Pakistan in 2010 and forward
+- Dropped tzdata-2010g-tunis.patch
+- Dropped tzdata-2010f-g.patch
+- Dropped tzdata-2010g-karachi.patch
+
+
 * Mon Mar 29 2010 Petr Machata  - 2010f-3
 - Tunisia not to observe DST in 2010 (tzdata-2010g-tunis.patch)
 - Pakistan not to observe DST in 2010 (tzdata-2010g-karachi.patch)

From 49adb2da3e9b3080fe90874a03ee2e7b59018a44 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 6 Apr 2010 14:19:03 +0000
Subject: [PATCH 106/280] Dropped tzcode2010f reference by mistake

---
 sources     | 1 +
 tzdata.spec | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index 43e4048..0cc82b5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
 d384ac091e6d56802f9b3e6b3d3f0f2e  tzdata2010h.tar.gz
+e530cc9bbdfd5e8c1eac21a68f4d5656  tzcode2010f.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 9e70718..43ec26d 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2010h
 %define tzdata_version 2010h
 %define tzcode_version 2010f
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -111,7 +111,7 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
-* Tue Apr 06 2010 Petr Machata  - 2010h-1
+* Tue Apr 06 2010 Petr Machata  - 2010h-2
 - Upstream 2010g:
   - No Bangladesh DST in 2010 and forward.
   - Gaza DST starts last Saturday in March at 12:01 a.m. in 2010 and forward

From e7f8a1e1a9325313ed7a02187ba554fe529d0a6d Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 19 Apr 2010 16:52:20 +0000
Subject: [PATCH 107/280] - Upstream 2007h - Brazil will observe DST from
 2007-10-14 to 2008-02-17 - Egypt and Gaza switched earlier than we expected -
 Iran will resume DST next year - Venezuela is scheduled to change TZ to -4:30
 on January 1 - Upstream 2007g - Egypt switches the September 7, not September
 28 - Daviess, Dubous, Knox, Martin, and Pike Counties, Indiana, switch from  
   central to eastern time in November - South Australia, Tasmania, Victoria,
 and New South Wales are changing     their DST rules effective next year -
 Several Antarctic station's rules weren't properly updated to account for    
 this year's change to the New Zealand daylight saving rules - Upstream 2007f
 - New Zealand is extending DST, starting later this year. - Haiti no longer
 observes DST. - The Turks and Caicos switch at 02:00, not at 00:00, and have
 adopted US     DST rules.

---
 .cvsignore  |  1 +
 sources     |  2 +-
 tzdata.spec | 13 ++++++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 57602d8..ed6d49f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -39,3 +39,4 @@ tzdata2010e.tar.gz
 tzcode2010f.tar.gz
 tzdata2010f.tar.gz
 tzdata2010h.tar.gz
+tzdata2010i.tar.gz
diff --git a/sources b/sources
index 0cc82b5..8f22b46 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-d384ac091e6d56802f9b3e6b3d3f0f2e  tzdata2010h.tar.gz
 e530cc9bbdfd5e8c1eac21a68f4d5656  tzcode2010f.tar.gz
+4d2a90afd5bffe8df97f3def245e178e  tzdata2010i.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 43ec26d..dd8723d 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010h
-%define tzdata_version 2010h
+Version: 2010i
+%define tzdata_version 2010i
 %define tzcode_version 2010f
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -111,6 +111,13 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Apr 19 2010 Petr Machata  - 2010i-1
+- Upstream 2010i:
+  - Morocco will have DST from 2010-05-02 to 2010-08-08
+  - San Luis, Argentina will keep permanent DST after April 11, 2010
+  - Updates of historical stamps for Taiwan
+
+
 * Tue Apr 06 2010 Petr Machata  - 2010h-2
 - Upstream 2010g:
   - No Bangladesh DST in 2010 and forward.

From eb0b4b0ede1d6292f79756c9bdb3d23eefdce8e8 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 11 May 2010 11:53:48 +0000
Subject: [PATCH 108/280] - Upstream 2010j: - Bahia de Banderas (Mexican state
 of Nayarit) changed time zone UTC-7 to     new time zone UTC-6 on April 4,
 2010

---
 .cvsignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 14 ++++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ed6d49f..faba838 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -40,3 +40,5 @@ tzcode2010f.tar.gz
 tzdata2010f.tar.gz
 tzdata2010h.tar.gz
 tzdata2010i.tar.gz
+tzdata2010j.tar.gz
+tzcode2010j.tar.gz
diff --git a/sources b/sources
index 8f22b46..365ab5b 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-e530cc9bbdfd5e8c1eac21a68f4d5656  tzcode2010f.tar.gz
-4d2a90afd5bffe8df97f3def245e178e  tzdata2010i.tar.gz
+f668f66b260e14b477eac3f48bcfb5f4  tzdata2010j.tar.gz
+5ba8345720296d3a659b349b2052d139  tzcode2010j.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index dd8723d..6b7f561 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010i
-%define tzdata_version 2010i
-%define tzcode_version 2010f
+Version: 2010j
+%define tzdata_version 2010j
+%define tzcode_version 2010j
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -111,13 +111,17 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue May 11 2010 Petr Machata  - 2010j-1
+- Upstream 2010j:
+  - Bahia de Banderas (Mexican state of Nayarit) changed time zone
+    UTC-7 to new time zone UTC-6 on April 4, 2010
+
 * Mon Apr 19 2010 Petr Machata  - 2010i-1
 - Upstream 2010i:
   - Morocco will have DST from 2010-05-02 to 2010-08-08
   - San Luis, Argentina will keep permanent DST after April 11, 2010
   - Updates of historical stamps for Taiwan
 
-
 * Tue Apr 06 2010 Petr Machata  - 2010h-2
 - Upstream 2010g:
   - No Bangladesh DST in 2010 and forward.
@@ -132,7 +136,6 @@ rm -rf %{buildroot}
 - Dropped tzdata-2010f-g.patch
 - Dropped tzdata-2010g-karachi.patch
 
-
 * Mon Mar 29 2010 Petr Machata  - 2010f-3
 - Tunisia not to observe DST in 2010 (tzdata-2010g-tunis.patch)
 - Pakistan not to observe DST in 2010 (tzdata-2010g-karachi.patch)
@@ -154,7 +157,6 @@ rm -rf %{buildroot}
   - Samara changes to Moscow+0 on 2010-03-28
   - Related zone.tab updates
 
-
 * Tue Mar 09 2010 Petr Machata  - 2010e-1
 - Upstream 2010d
   - The DST change in Bangladesh takes place a minute earlier

From 82413b67cdb0d89adc63f004626455d47b857ded Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Thu, 29 Jul 2010 14:35:53 +0000
Subject: [PATCH 109/280] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 2 files changed, 21 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index bf95f05..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: tzdata
-# $Id: Makefile,v 1.2 2007/10/15 19:29:08 notting Exp $
-NAME := tzdata
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

From 373326df0c654843f378623d32bb9984400f2a9d Mon Sep 17 00:00:00 2001
From: "Tom \"spot\" Callaway" 
Date: Tue, 3 Aug 2010 09:29:27 -0400
Subject: [PATCH 110/280] 2010k

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index faba838..2268392 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@ tzdata2010h.tar.gz
 tzdata2010i.tar.gz
 tzdata2010j.tar.gz
 tzcode2010j.tar.gz
+tzdata2010k.tar.gz
+tzcode2010k.tar.gz
diff --git a/sources b/sources
index 365ab5b..026b909 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-f668f66b260e14b477eac3f48bcfb5f4  tzdata2010j.tar.gz
-5ba8345720296d3a659b349b2052d139  tzcode2010j.tar.gz
+5e2086249d6a6bb116534d358661ad3f  tzdata2010k.tar.gz
+63cd2199679c91bed972a0248d6916af  tzcode2010k.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 6b7f561..7a38ba1 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010j
-%define tzdata_version 2010j
-%define tzcode_version 2010j
+Version: 2010k
+%define tzdata_version 2010k
+%define tzcode_version 2010k
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -111,6 +111,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Aug  3 2010 Tom "spot" Callaway  - 2010k-1
+- Upstream 2010k:
+ - Egypt has announced that DST will be off during Ramadan, but
+   DST will resume afterwards (August 10, 2010 - September 9, 2010)
+
 * Tue May 11 2010 Petr Machata  - 2010j-1
 - Upstream 2010j:
   - Bahia de Banderas (Mexican state of Nayarit) changed time zone

From 612b2c71538c8b9c6493e9775a1cbd55c23ac0c0 Mon Sep 17 00:00:00 2001
From: "Tom \"spot\" Callaway" 
Date: Tue, 3 Aug 2010 09:30:46 -0400
Subject: [PATCH 111/280] 2010k

---
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sources b/sources
index 365ab5b..026b909 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-f668f66b260e14b477eac3f48bcfb5f4  tzdata2010j.tar.gz
-5ba8345720296d3a659b349b2052d139  tzcode2010j.tar.gz
+5e2086249d6a6bb116534d358661ad3f  tzdata2010k.tar.gz
+63cd2199679c91bed972a0248d6916af  tzcode2010k.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 6b7f561..7a38ba1 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010j
-%define tzdata_version 2010j
-%define tzcode_version 2010j
+Version: 2010k
+%define tzdata_version 2010k
+%define tzcode_version 2010k
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -111,6 +111,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Aug  3 2010 Tom "spot" Callaway  - 2010k-1
+- Upstream 2010k:
+ - Egypt has announced that DST will be off during Ramadan, but
+   DST will resume afterwards (August 10, 2010 - September 9, 2010)
+
 * Tue May 11 2010 Petr Machata  - 2010j-1
 - Upstream 2010j:
   - Bahia de Banderas (Mexican state of Nayarit) changed time zone

From 6d3de1d89f83d2b36885275145d83401b7fbd0f4 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 16 Aug 2010 14:10:30 +0200
Subject: [PATCH 112/280] - Upstream 2010l:   - Change Cairo's 2010 reversion
 to DST from the midnight between     September 8 and 9 to the midnight
 between September 9 and 10.   - Change Gaza's 2010 return to standard time to
 the midnight between     August 10 and 11.   - Bahia de Banderas (Mexican
 state of Nayarit) changed time zone     UTC-7 to new time zone UTC-6 on April
 4, 2010

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2268392..3be3151 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ tzdata2010j.tar.gz
 tzcode2010j.tar.gz
 tzdata2010k.tar.gz
 tzcode2010k.tar.gz
+tzcode2010l.tar.gz
+tzdata2010l.tar.gz
diff --git a/sources b/sources
index 026b909..b638b09 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-5e2086249d6a6bb116534d358661ad3f  tzdata2010k.tar.gz
-63cd2199679c91bed972a0248d6916af  tzcode2010k.tar.gz
+77668c37a0b13753c65eee5db3a4b009  tzcode2010l.tar.gz
+0458bd8ffd537146d34b1a658c42efa5  tzdata2010l.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 7a38ba1..1d9c8f8 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010k
-%define tzdata_version 2010k
-%define tzcode_version 2010k
+Version: 2010l
+%define tzdata_version 2010l
+%define tzcode_version 2010l
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -111,6 +111,15 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Aug 16 2010 Petr Machata  - 2010l-2
+- Upstream 2010l:
+  - Change Cairo's 2010 reversion to DST from the midnight between
+    September 8 and 9 to the midnight between September 9 and 10.
+  - Change Gaza's 2010 return to standard time to the midnight between
+    August 10 and 11.
+  - Bahia de Banderas (Mexican state of Nayarit) changed time zone
+    UTC-7 to new time zone UTC-6 on April 4, 2010
+
 * Tue Aug  3 2010 Tom "spot" Callaway  - 2010k-1
 - Upstream 2010k:
  - Egypt has announced that DST will be off during Ramadan, but

From 2d238ce1e30381478ab6292a6be04e6fd23efc44 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 27 Oct 2010 17:58:13 +0200
Subject: [PATCH 113/280] - Upstream 2010m:   - Hong Kong didn't observe DST in
 1977   - In zone.tab, remove obsolete association of Vostok Station with    
 South Magnetic Pole; add association with Lake Vostok - Upstream 2010n:   -
 Change end of DST in Samoa in 2011 from 2011-04-03 0:00 to     2011-04-03
 1:00

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 16 +++++++++++++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3be3151..2c962e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,5 @@ tzdata2010k.tar.gz
 tzcode2010k.tar.gz
 tzcode2010l.tar.gz
 tzdata2010l.tar.gz
+/tzdata2010n.tar.gz
+/tzcode2010n.tar.gz
diff --git a/sources b/sources
index b638b09..d9d3a08 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-77668c37a0b13753c65eee5db3a4b009  tzcode2010l.tar.gz
-0458bd8ffd537146d34b1a658c42efa5  tzdata2010l.tar.gz
+b5eefb4986866895ab84f52220f1dfa6  tzdata2010n.tar.gz
+a7a776a5713831993e814fe0c05f9fd5  tzcode2010n.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 1d9c8f8..de951ae 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010l
-%define tzdata_version 2010l
-%define tzcode_version 2010l
+Version: 2010n
+%define tzdata_version 2010n
+%define tzcode_version 2010n
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -111,6 +111,16 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Oct 27 2010 Petr Machata  - 2010n-1
+- Upstream 2010m:
+  - Hong Kong didn't observe DST in 1977
+  - In zone.tab, remove obsolete association of Vostok Station with
+    South Magnetic Pole; add association with Lake Vostok
+- Upstream 2010n:
+  - Change end of DST in Samoa in 2011 from 2011-04-03 0:00 to
+    2011-04-03 1:00
+
+
 * Mon Aug 16 2010 Petr Machata  - 2010l-2
 - Upstream 2010l:
   - Change Cairo's 2010 reversion to DST from the midnight between

From 9832396781a434cd5e96023373dac2438a2446f7 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 27 Oct 2010 18:00:15 +0200
Subject: [PATCH 114/280] - Upstream 2010m:   - Hong Kong didn't observe DST in
 1977   - In zone.tab, remove obsolete association of Vostok Station with    
 South Magnetic Pole; add association with Lake Vostok - Upstream 2010n:   -
 Change end of DST in Samoa in 2011 from 2011-04-03 0:00 to     2011-04-03
 1:00

---
 sources     |  4 ++--
 tzdata.spec | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/sources b/sources
index b638b09..d9d3a08 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-77668c37a0b13753c65eee5db3a4b009  tzcode2010l.tar.gz
-0458bd8ffd537146d34b1a658c42efa5  tzdata2010l.tar.gz
+b5eefb4986866895ab84f52220f1dfa6  tzdata2010n.tar.gz
+a7a776a5713831993e814fe0c05f9fd5  tzcode2010n.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 1d9c8f8..de951ae 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010l
-%define tzdata_version 2010l
-%define tzcode_version 2010l
+Version: 2010n
+%define tzdata_version 2010n
+%define tzcode_version 2010n
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -111,6 +111,16 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Oct 27 2010 Petr Machata  - 2010n-1
+- Upstream 2010m:
+  - Hong Kong didn't observe DST in 1977
+  - In zone.tab, remove obsolete association of Vostok Station with
+    South Magnetic Pole; add association with Lake Vostok
+- Upstream 2010n:
+  - Change end of DST in Samoa in 2011 from 2011-04-03 0:00 to
+    2011-04-03 1:00
+
+
 * Mon Aug 16 2010 Petr Machata  - 2010l-2
 - Upstream 2010l:
   - Change Cairo's 2010 reversion to DST from the midnight between

From d854230782f64dd490ca2a2397c9a8408394c100 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 9 Nov 2010 14:24:29 +0100
Subject: [PATCH 115/280] Upstream 2010o

---
 .gitignore  |  1 +
 sources     |  2 +-
 tzdata.spec | 10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2c962e6..1a9fd70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ tzcode2010l.tar.gz
 tzdata2010l.tar.gz
 /tzdata2010n.tar.gz
 /tzcode2010n.tar.gz
+/tzdata2010o.tar.gz
diff --git a/sources b/sources
index d9d3a08..d7e4634 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-b5eefb4986866895ab84f52220f1dfa6  tzdata2010n.tar.gz
 a7a776a5713831993e814fe0c05f9fd5  tzcode2010n.tar.gz
+5cae5c56fad81dc29f8fcd933a05768e  tzdata2010o.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index de951ae..f938c43 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,7 +1,7 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010n
-%define tzdata_version 2010n
+Version: 2010o
+%define tzdata_version 2010o
 %define tzcode_version 2010n
 Release: 1%{?dist}
 License: Public Domain
@@ -111,6 +111,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Nov 09 2010 Petr Machata  - 2010o-1
+- Upstream 2010o:
+  - Fiji will end DST on March 6, 2011, not March 27, 2011
+- Resolves: #650472
+
 * Wed Oct 27 2010 Petr Machata  - 2010n-1
 - Upstream 2010m:
   - Hong Kong didn't observe DST in 1977
@@ -120,7 +125,6 @@ rm -rf %{buildroot}
   - Change end of DST in Samoa in 2011 from 2011-04-03 0:00 to
     2011-04-03 1:00
 
-
 * Mon Aug 16 2010 Petr Machata  - 2010l-2
 - Upstream 2010l:
   - Change Cairo's 2010 reversion to DST from the midnight between

From 1f809e7333b855a1700c83723ab39b9a5934d0e1 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 9 Nov 2010 14:24:52 +0100
Subject: [PATCH 116/280] Upstream 2010o

---
 sources     | 2 +-
 tzdata.spec | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sources b/sources
index d9d3a08..d7e4634 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-b5eefb4986866895ab84f52220f1dfa6  tzdata2010n.tar.gz
 a7a776a5713831993e814fe0c05f9fd5  tzcode2010n.tar.gz
+5cae5c56fad81dc29f8fcd933a05768e  tzdata2010o.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index de951ae..b23aed6 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,7 +1,7 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010n
-%define tzdata_version 2010n
+Version: 2010o
+%define tzdata_version 2010o
 %define tzcode_version 2010n
 Release: 1%{?dist}
 License: Public Domain
@@ -111,6 +111,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Nov 09 2010 Petr Machata  - 2010o-1
+- Upstream 2010o:
+  - Fiji will end DST on March 6, 2011, not March 27, 2011
+
 * Wed Oct 27 2010 Petr Machata  - 2010n-1
 - Upstream 2010m:
   - Hong Kong didn't observe DST in 1977
@@ -120,7 +124,6 @@ rm -rf %{buildroot}
   - Change end of DST in Samoa in 2011 from 2011-04-03 0:00 to
     2011-04-03 1:00
 
-
 * Mon Aug 16 2010 Petr Machata  - 2010l-2
 - Upstream 2010l:
   - Change Cairo's 2010 reversion to DST from the midnight between

From 584a263bee22be030cb78037f48e786f9ad38fa4 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 24 Jan 2011 21:37:43 +0100
Subject: [PATCH 117/280] Upstream 2011a   - Updates of historical stamps for
 Hawaii

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 10 +++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1a9fd70..dfaac61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,5 @@ tzdata2010l.tar.gz
 /tzdata2010n.tar.gz
 /tzcode2010n.tar.gz
 /tzdata2010o.tar.gz
+/tzdata2011a.tar.gz
+/tzcode2011a.tar.gz
diff --git a/sources b/sources
index d7e4634..076e42c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-a7a776a5713831993e814fe0c05f9fd5  tzcode2010n.tar.gz
-5cae5c56fad81dc29f8fcd933a05768e  tzdata2010o.tar.gz
+d60f168fb7307d8c1b926c7dc3a6c5c1  tzdata2011a.tar.gz
+001db5591974e6db7797a90cbdcbbadc  tzcode2011a.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index f938c43..4627e05 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010o
-%define tzdata_version 2010o
-%define tzcode_version 2010n
+Version: 2011a
+%define tzdata_version 2011a
+%define tzcode_version 2011a
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -111,6 +111,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Jan 24 2011 Petr Machata  - 2011a-1
+- Upstream 2011a:
+  - Updates of historical stamps for Hawaii
+
 * Tue Nov 09 2010 Petr Machata  - 2010o-1
 - Upstream 2010o:
   - Fiji will end DST on March 6, 2011, not March 27, 2011

From 72c8cc20d588c23a7bab0ce6532993fda5cb2dae Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 9 Feb 2011 13:11:08 +0100
Subject: [PATCH 118/280] Upstream 2011b:

- America/North_Dakota/Beulah: Mercer County, North Dakota, changed
  from the mountain time zone to the central time zone
---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index dfaac61..374b841 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,5 @@ tzdata2010l.tar.gz
 /tzdata2010o.tar.gz
 /tzdata2011a.tar.gz
 /tzcode2011a.tar.gz
+/tzdata2011b.tar.gz
+/tzcode2011b.tar.gz
diff --git a/sources b/sources
index 076e42c..1d8dadd 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-d60f168fb7307d8c1b926c7dc3a6c5c1  tzdata2011a.tar.gz
-001db5591974e6db7797a90cbdcbbadc  tzcode2011a.tar.gz
+9eaf3ca354c42a32bd28e623539bf0e0  tzdata2011b.tar.gz
+c63a1425f7252aef1fe54a258cdccff8  tzcode2011b.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 4627e05..b8b904a 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011a
-%define tzdata_version 2011a
-%define tzcode_version 2011a
+Version: 2011b
+%define tzdata_version 2011b
+%define tzcode_version 2011b
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -111,6 +111,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Feb 09 2011 Petr Machata  - 2011b-1
+- Upstream 2011b:
+  - America/North_Dakota/Beulah: Mercer County, North Dakota, changed
+    from the mountain time zone to the central time zone
+
 * Mon Jan 24 2011 Petr Machata  - 2011a-1
 - Upstream 2011a:
   - Updates of historical stamps for Hawaii

From 3c4325a08133d19cc4708472905b0ec971a1f662 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 9 Feb 2011 13:12:14 +0100
Subject: [PATCH 119/280] Upstream 2011b

- America/North_Dakota/Beulah: Mercer County, North Dakota, changed
  from the mountain time zone to the central time zone
---
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sources b/sources
index 076e42c..1d8dadd 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-d60f168fb7307d8c1b926c7dc3a6c5c1  tzdata2011a.tar.gz
-001db5591974e6db7797a90cbdcbbadc  tzcode2011a.tar.gz
+9eaf3ca354c42a32bd28e623539bf0e0  tzdata2011b.tar.gz
+c63a1425f7252aef1fe54a258cdccff8  tzcode2011b.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 9b8448c..9dbb1fd 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011a
-%define tzdata_version 2011a
-%define tzcode_version 2011a
+Version: 2011b
+%define tzdata_version 2011b
+%define tzcode_version 2011b
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -111,6 +111,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Feb 09 2011 Petr Machata  - 2011b-1
+- Upstream 2011b:
+  - America/North_Dakota/Beulah: Mercer County, North Dakota, changed
+    from the mountain time zone to the central time zone
+
 * Mon Jan 24 2011 Petr Machata  - 2011a-1
 - Upstream 2011a:
   - Updates of historical stamps for Hawaii

From 88c75a1ea747065b9b97a6f1569f6b39e128e62c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore 
Date: Wed, 9 Feb 2011 15:49:08 -0600
Subject: [PATCH 120/280] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 tzdata.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index b8b904a..83ab7a6 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011b
 %define tzdata_version 2011b
 %define tzcode_version 2011b
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -111,6 +111,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Feb 09 2011 Fedora Release Engineering  - 2011b-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Wed Feb 09 2011 Petr Machata  - 2011b-1
 - Upstream 2011b:
   - America/North_Dakota/Beulah: Mercer County, North Dakota, changed

From 1a3768ffd3b82944bf3a844373dbe02c6b707f1c Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Thu, 3 Mar 2011 23:16:15 +0100
Subject: [PATCH 121/280] Add tentative 2011c for Chile change

- Update of historical stamps for Juneau, Sitka, and histcurrent stamps
  for Metlakatla.  Sitka and Metlakatla are new zones.
- Delay end of DST in Chile in 2011 until first Sunday in April.
---
 .gitignore           |   2 +
 tzdata-2011b-c.patch | 303 +++++++++++++++++++++++++++++++++++++++++++
 tzdata.spec          |   9 +-
 3 files changed, 313 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011b-c.patch

diff --git a/.gitignore b/.gitignore
index 374b841..c031c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,5 @@ tzdata2010l.tar.gz
 /tzcode2011a.tar.gz
 /tzdata2011b.tar.gz
 /tzcode2011b.tar.gz
+tzdata/
+*.rpm
diff --git a/tzdata-2011b-c.patch b/tzdata-2011b-c.patch
new file mode 100644
index 0000000..19e6901
--- /dev/null
+++ b/tzdata-2011b-c.patch
@@ -0,0 +1,303 @@
+diff -r -c tzdata2011b/leapseconds tzdata2011b/leapseconds
+*** tzdata2011b/leapseconds	Thu Dec 16 12:24:20 2010
+--- tzdata2011b/leapseconds	Mon Feb 14 09:30:33 2011
+***************
+*** 1,5 ****
+  # 
+! # @(#)leapseconds	8.10
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
+! # @(#)leapseconds	8.11
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 56,68 ****
+  # SERVICE DE LA ROTATION TERRESTRE
+  # OBSERVATOIRE DE PARIS
+  # 61, Av. de l'Observatoire 75014 PARIS (France)
+! # Tel.      : 33 (0) 1 40 51 22 26
+  # FAX       : 33 (0) 1 40 51 22 91
+  # Internet  : services.iers@obspm.fr
+  #
+! # Paris, 14 July 2010
+  #
+! # Bulletin C 40
+  #
+  # To authorities responsible
+  # for the measurement and
+--- 56,68 ----
+  # SERVICE DE LA ROTATION TERRESTRE
+  # OBSERVATOIRE DE PARIS
+  # 61, Av. de l'Observatoire 75014 PARIS (France)
+! # Tel.      : 33 (0) 1 40 51 22 29
+  # FAX       : 33 (0) 1 40 51 22 91
+  # Internet  : services.iers@obspm.fr
+  #
+! # Paris, 2 February 2011
+  #
+! # Bulletin C 41
+  #
+  # To authorities responsible
+  # for the measurement and
+***************
+*** 70,78 ****
+  #
+  # INFORMATION ON UTC - TAI
+  #
+! # NO positive leap second will be introduced at the end of December 2010.
+  # The difference between Coordinated Universal Time UTC and the
+! # International Atomic Time TAI is :
+  #
+  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
+  #
+--- 70,78 ----
+  #
+  # INFORMATION ON UTC - TAI
+  #
+! # NO positive leap second will be introduced at the end of June 2011.
+  # The difference between Coordinated Universal Time UTC and the
+! # International Atomic Time TAI is :		
+  #
+  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
+  #
+***************
+*** 82,87 ****
+  # will be no time step at the next possible date.
+  #
+  # Daniel GAMBIS
+! # Director
+! # Earth Orientation Center of IERS
+  # Observatoire de Paris, France
+--- 82,87 ----
+  # will be no time step at the next possible date.
+  #
+  # Daniel GAMBIS
+! # Head			
+! # Earth Orientation Center of the IERS
+  # Observatoire de Paris, France
+diff -r -c tzdata2011b/northamerica tzdata2011b/northamerica
+*** tzdata2011b/northamerica	Wed Jan 26 17:13:48 2011
+--- tzdata2011b/northamerica	Wed Feb  9 14:00:33 2011
+***************
+*** 1,5 ****
+  # 
+! # @(#)northamerica	8.40
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
+! # @(#)northamerica	8.41
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 426,431 ****
+--- 426,473 ----
+  # were nearby inhabitants in some cases and for our purposes perhaps
+  # it's best to simply use the official transition.
+  #
++ 
++ # From Steve Ferguson (2011-01-31):
++ # The author lives in Alaska and many of the references listed are only
++ # available to Alaskan residents.
++ #
++ # 
++ # http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98
++ # 
++ 
++ # From Arthur David Olson (2011-02-01):
++ # Here's database-relevant material from the 2001 "Alaska History" article:
++ #
++ # On September 20 [1979]...DOT...officials decreed that on April 27,
++ # 1980, Juneau and other nearby communities would move to Yukon Time.
++ # Sitka, Petersburg, Wrangell, and Ketchikan, however, would remain on
++ # Pacific Time.
++ #
++ # ...on September 22, 1980, DOT Secretary Neil E. Goldschmidt rescinded the
++ # Department's September 1979 decision. Juneau and other communities in
++ # northern Southeast reverted to Pacific Time on October 26.
++ #
++ # On October 28 [1983]...the Metlakatla Indian Community Council voted
++ # unanimously to keep the reservation on Pacific Time.
++ #
++ # According to DOT official Joanne Petrie, Indian reservations are not
++ # bound to follow time zones imposed by neighboring jurisdictions.
++ #
++ # (The last is consistent with how the database now handles the Navajo
++ # Nation.)
++ 
++ # From Arthur David Olson (2011-02-09):
++ # I just spoke by phone with a staff member at the Metlakatla Indian
++ # Community office (using contact information available at
++ # 
++ # http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla
++ # ).
++ # It's shortly after 1:00 here on the east coast of the United States;
++ # the staffer said it was shortly after 10:00 there. When I asked whether
++ # that meant they were on Pacific time, they said no--they were on their
++ # own time. I asked about daylight saving; they said it wasn't used. I
++ # did not inquire about practices in the past.
++ 
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+  Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
+  			 -8:57:41 -	LMT	1900 Aug 20 12:00
+***************
+*** 432,440 ****
+--- 474,499 ----
+  			 -8:00	-	PST	1942
+  			 -8:00	US	P%sT	1946
+  			 -8:00	-	PST	1969
++ 			 -8:00	US	P%sT	1980 Apr 27 2:00
++ 			 -9:00	US	Y%sT	1980 Oct 26 2:00	
+  			 -8:00	US	P%sT	1983 Oct 30 2:00
+  			 -9:00	US	Y%sT	1983 Nov 30
+  			 -9:00	US	AK%sT
++ Zone America/Sitka	 -14:58:47 -	LMT	1867 Oct 18
++ 			 -9:01:13 -	LMT	1900 Aug 20 12:00
++ 			 -8:00	-	PST	1942
++ 			 -8:00	US	P%sT	1946
++ 			 -8:00	-	PST	1969
++ 			 -8:00	US	P%sT	1983 Oct 30 2:00
++ 			 -9:00	US	Y%sT	1983 Nov 30
++ 			 -9:00	US	AK%sT
++ Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
++ 			 -8:46:18 -	LMT	1900 Aug 20 12:00
++ 			 -8:00	-	PST	1942
++ 			 -8:00	US	P%sT	1946
++ 			 -8:00	-	PST	1969
++ 			 -8:00	US	P%sT	1983 Oct 30 2:00
++ 			 -8:00	US	MeST
+  Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
+  			 -9:18:55 -	LMT	1900 Aug 20 12:00
+  			 -9:00	-	YST	1942
+diff -r -c tzdata2011b/southamerica tzdata2011b/southamerica
+*** tzdata2011b/southamerica	Thu Dec 16 12:24:20 2010
+--- tzdata2011b/southamerica	Wed Mar  2 12:47:20 2011
+***************
+*** 1,5 ****
+  # 
+! # @(#)southamerica	8.44
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
+! # @(#)southamerica	8.45
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 1154,1159 ****
+--- 1154,1176 ----
+  # From Arthur Daivd Olson (2010-03-06):
+  # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
+  
++ # From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
++ # It appears that the Chilean government has decided to postpone the
++ # change from summer time to winter time again, by three weeks to April
++ # 2nd:
++ # 
++ # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
++ # 
++ #
++ # This is not yet reflected in the offical "cambio de hora" site, but
++ # probably will be soon:
++ # 
++ # http://www.horaoficial.cl/cambio.htm
++ # 
++ 
++ # From Arthur David Olson (2011-03-02):
++ # The emol.com article mentions a water shortage as the cause of the
++ # postponement, which may mean that it's not a permanent change.
+  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+  Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
+  Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
+***************
+*** 1189,1196 ****
+  # which is used below in specifying the transition.
+  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+! Rule	Chile	2010	only	-	Apr	 4	3:00u	0	-
+! Rule	Chile	2011	max	-	Mar	Sun>=9	3:00u	0	-
+  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+  # (1996-09) says 1998-03-08.  Ignore these.
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+--- 1206,1213 ----
+  # which is used below in specifying the transition.
+  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+! Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
+! Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
+  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+  # (1996-09) says 1998-03-08.  Ignore these.
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+diff -r -c tzdata2011b/tz-art.htm tzdata2011b/tz-art.htm
+*** tzcode2011b/tz-art.htm	Wed Jan 19 13:47:16 2011
+--- tzcode2011b/tz-art.htm	Mon Feb 14 16:22:50 2011
+***************
+*** 9,15 ****
+  
+  
Time and the Arts

+  

+! @(#)tz-art.htm	8.19
+  

+  

+  This file is in the public domain, so clarified as of
+--- 9,15 ----
+  
+  
Time and the Arts

+  

+! @(#)tz-art.htm	8.20
+  

+  

+  This file is in the public domain, so clarified as of
+***************
+*** 417,422 ****
+--- 417,427 ----
+  http://us.imdb.com/title/tt0137494/
+  . (Mark Brader, 2009-10-02)
+  
++ 
  • 
++ In "The Todd Couple" episode of "Outsourced" (first aired 2011-02-10),
++ Manmeet sets up teledates for 6:00 and 9:00;
++ since one is with a New Yorker and the other with a San Franciscan,
++ hilarity ensues.
+  
    • 
+  
+  
    
+diff -r -c tzdata2011b/zone.tab tzdata2011b/zone.tab
+*** tzdata2011b/zone.tab	Wed Jan 26 18:47:09 2011
+--- tzdata2011b/zone.tab	Wed Feb  9 14:00:33 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)zone.tab	8.40
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  #
+--- 1,5 ----
+  # 
    +! # @(#)zone.tab	8.41
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  #
+***************
+*** 412,420 ****
+--- 412,422 ----
+  US	+340308-1181434	America/Los_Angeles	Pacific Time
+  US	+611305-1495401	America/Anchorage	Alaska Time
+  US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
++ US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+  US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+  US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+  US	+515248-1763929	America/Adak	Aleutian Islands
++ US	+550737-1313435	America/Metlakatla	Metlakatla Time - Annette Island
+  US	+211825-1575130	Pacific/Honolulu	Hawaii
+  UY	-3453-05611	America/Montevideo
+  UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+
diff --git a/tzdata.spec b/tzdata.spec
index b8b904a..59432ee 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011b
 %define tzdata_version 2011b
 %define tzcode_version 2011b
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,6 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
+Patch1: tzdata-2011b-c.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
+%patch1 -p0
 # __end
 
 mkdir javazic
@@ -111,6 +113,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Mar 03 2011 Petr Machata  - 2011b-2
+- Update of historical stamps for Juneau, Sitka, and histcurrent stamps
+  for Metlakatla.  Sitka and Metlakatla are new zones.
+- Delay end of DST in Chile in 2011 until first Sunday in April. (tzdata-2010b-c.patch)
+
 * Wed Feb 09 2011 Petr Machata  - 2011b-1
 - Upstream 2011b:
   - America/North_Dakota/Beulah: Mercer County, North Dakota, changed

From 81e6baf86f85c645d7ddb187d759b25ac2fe56b3 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Thu, 3 Mar 2011 23:25:37 +0100
Subject: [PATCH 122/280] Tentative 2011c for Chile update

- Update of historical stamps for Juneau, Sitka, and histcurrent stamps
  for Metlakatla.  Sitka and Metlakatla are new zones.
- Delay end of DST in Chile in 2011 until first Sunday in April.
---
 .gitignore           |   2 +
 tzdata-2011b-c.patch | 303 +++++++++++++++++++++++++++++++++++++++++++
 tzdata.spec          |   9 +-
 3 files changed, 313 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011b-c.patch

diff --git a/.gitignore b/.gitignore
index 374b841..c031c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,5 @@ tzdata2010l.tar.gz
 /tzcode2011a.tar.gz
 /tzdata2011b.tar.gz
 /tzcode2011b.tar.gz
+tzdata/
+*.rpm
diff --git a/tzdata-2011b-c.patch b/tzdata-2011b-c.patch
new file mode 100644
index 0000000..19e6901
--- /dev/null
+++ b/tzdata-2011b-c.patch
@@ -0,0 +1,303 @@
+diff -r -c tzdata2011b/leapseconds tzdata2011b/leapseconds
+*** tzdata2011b/leapseconds	Thu Dec 16 12:24:20 2010
+--- tzdata2011b/leapseconds	Mon Feb 14 09:30:33 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)leapseconds	8.10
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
    +! # @(#)leapseconds	8.11
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 56,68 ****
+  # SERVICE DE LA ROTATION TERRESTRE
+  # OBSERVATOIRE DE PARIS
+  # 61, Av. de l'Observatoire 75014 PARIS (France)
+! # Tel.      : 33 (0) 1 40 51 22 26
+  # FAX       : 33 (0) 1 40 51 22 91
+  # Internet  : services.iers@obspm.fr
+  #
+! # Paris, 14 July 2010
+  #
+! # Bulletin C 40
+  #
+  # To authorities responsible
+  # for the measurement and
+--- 56,68 ----
+  # SERVICE DE LA ROTATION TERRESTRE
+  # OBSERVATOIRE DE PARIS
+  # 61, Av. de l'Observatoire 75014 PARIS (France)
+! # Tel.      : 33 (0) 1 40 51 22 29
+  # FAX       : 33 (0) 1 40 51 22 91
+  # Internet  : services.iers@obspm.fr
+  #
+! # Paris, 2 February 2011
+  #
+! # Bulletin C 41
+  #
+  # To authorities responsible
+  # for the measurement and
+***************
+*** 70,78 ****
+  #
+  # INFORMATION ON UTC - TAI
+  #
+! # NO positive leap second will be introduced at the end of December 2010.
+  # The difference between Coordinated Universal Time UTC and the
+! # International Atomic Time TAI is :
+  #
+  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
+  #
+--- 70,78 ----
+  #
+  # INFORMATION ON UTC - TAI
+  #
+! # NO positive leap second will be introduced at the end of June 2011.
+  # The difference between Coordinated Universal Time UTC and the
+! # International Atomic Time TAI is :		
+  #
+  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
+  #
+***************
+*** 82,87 ****
+  # will be no time step at the next possible date.
+  #
+  # Daniel GAMBIS
+! # Director
+! # Earth Orientation Center of IERS
+  # Observatoire de Paris, France
+--- 82,87 ----
+  # will be no time step at the next possible date.
+  #
+  # Daniel GAMBIS
+! # Head			
+! # Earth Orientation Center of the IERS
+  # Observatoire de Paris, France
+diff -r -c tzdata2011b/northamerica tzdata2011b/northamerica
+*** tzdata2011b/northamerica	Wed Jan 26 17:13:48 2011
+--- tzdata2011b/northamerica	Wed Feb  9 14:00:33 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)northamerica	8.40
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
    +! # @(#)northamerica	8.41
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 426,431 ****
+--- 426,473 ----
+  # were nearby inhabitants in some cases and for our purposes perhaps
+  # it's best to simply use the official transition.
+  #
++ 
++ # From Steve Ferguson (2011-01-31):
++ # The author lives in Alaska and many of the references listed are only
++ # available to Alaskan residents.
++ #
++ # 
++ # http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98
++ # 
++ 
++ # From Arthur David Olson (2011-02-01):
++ # Here's database-relevant material from the 2001 "Alaska History" article:
++ #
++ # On September 20 [1979]...DOT...officials decreed that on April 27,
++ # 1980, Juneau and other nearby communities would move to Yukon Time.
++ # Sitka, Petersburg, Wrangell, and Ketchikan, however, would remain on
++ # Pacific Time.
++ #
++ # ...on September 22, 1980, DOT Secretary Neil E. Goldschmidt rescinded the
++ # Department's September 1979 decision. Juneau and other communities in
++ # northern Southeast reverted to Pacific Time on October 26.
++ #
++ # On October 28 [1983]...the Metlakatla Indian Community Council voted
++ # unanimously to keep the reservation on Pacific Time.
++ #
++ # According to DOT official Joanne Petrie, Indian reservations are not
++ # bound to follow time zones imposed by neighboring jurisdictions.
++ #
++ # (The last is consistent with how the database now handles the Navajo
++ # Nation.)
++ 
++ # From Arthur David Olson (2011-02-09):
++ # I just spoke by phone with a staff member at the Metlakatla Indian
++ # Community office (using contact information available at
++ # 
++ # http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla
++ # ).
++ # It's shortly after 1:00 here on the east coast of the United States;
++ # the staffer said it was shortly after 10:00 there. When I asked whether
++ # that meant they were on Pacific time, they said no--they were on their
++ # own time. I asked about daylight saving; they said it wasn't used. I
++ # did not inquire about practices in the past.
++ 
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+  Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
+  			 -8:57:41 -	LMT	1900 Aug 20 12:00
+***************
+*** 432,440 ****
+--- 474,499 ----
+  			 -8:00	-	PST	1942
+  			 -8:00	US	P%sT	1946
+  			 -8:00	-	PST	1969
++ 			 -8:00	US	P%sT	1980 Apr 27 2:00
++ 			 -9:00	US	Y%sT	1980 Oct 26 2:00	
+  			 -8:00	US	P%sT	1983 Oct 30 2:00
+  			 -9:00	US	Y%sT	1983 Nov 30
+  			 -9:00	US	AK%sT
++ Zone America/Sitka	 -14:58:47 -	LMT	1867 Oct 18
++ 			 -9:01:13 -	LMT	1900 Aug 20 12:00
++ 			 -8:00	-	PST	1942
++ 			 -8:00	US	P%sT	1946
++ 			 -8:00	-	PST	1969
++ 			 -8:00	US	P%sT	1983 Oct 30 2:00
++ 			 -9:00	US	Y%sT	1983 Nov 30
++ 			 -9:00	US	AK%sT
++ Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
++ 			 -8:46:18 -	LMT	1900 Aug 20 12:00
++ 			 -8:00	-	PST	1942
++ 			 -8:00	US	P%sT	1946
++ 			 -8:00	-	PST	1969
++ 			 -8:00	US	P%sT	1983 Oct 30 2:00
++ 			 -8:00	US	MeST
+  Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
+  			 -9:18:55 -	LMT	1900 Aug 20 12:00
+  			 -9:00	-	YST	1942
+diff -r -c tzdata2011b/southamerica tzdata2011b/southamerica
+*** tzdata2011b/southamerica	Thu Dec 16 12:24:20 2010
+--- tzdata2011b/southamerica	Wed Mar  2 12:47:20 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)southamerica	8.44
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
    +! # @(#)southamerica	8.45
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 1154,1159 ****
+--- 1154,1176 ----
+  # From Arthur Daivd Olson (2010-03-06):
+  # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
+  
++ # From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
++ # It appears that the Chilean government has decided to postpone the
++ # change from summer time to winter time again, by three weeks to April
++ # 2nd:
++ # 
++ # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
++ # 
++ #
++ # This is not yet reflected in the offical "cambio de hora" site, but
++ # probably will be soon:
++ # 
++ # http://www.horaoficial.cl/cambio.htm
++ # 
++ 
++ # From Arthur David Olson (2011-03-02):
++ # The emol.com article mentions a water shortage as the cause of the
++ # postponement, which may mean that it's not a permanent change.
+  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+  Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
+  Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
+***************
+*** 1189,1196 ****
+  # which is used below in specifying the transition.
+  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+! Rule	Chile	2010	only	-	Apr	 4	3:00u	0	-
+! Rule	Chile	2011	max	-	Mar	Sun>=9	3:00u	0	-
+  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+  # (1996-09) says 1998-03-08.  Ignore these.
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+--- 1206,1213 ----
+  # which is used below in specifying the transition.
+  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+! Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
+! Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
+  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+  # (1996-09) says 1998-03-08.  Ignore these.
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+diff -r -c tzdata2011b/tz-art.htm tzdata2011b/tz-art.htm
+*** tzcode2011b/tz-art.htm	Wed Jan 19 13:47:16 2011
+--- tzcode2011b/tz-art.htm	Mon Feb 14 16:22:50 2011
+***************
+*** 9,15 ****
+  
+  
    Time and the Arts
    
+  
    
+! @(#)tz-art.htm	8.19
+  
    
+  
    
+  This file is in the public domain, so clarified as of
+--- 9,15 ----
+  
+  
    Time and the Arts
    
+  
    
+! @(#)tz-art.htm	8.20
+  
    
+  
    
+  This file is in the public domain, so clarified as of
+***************
+*** 417,422 ****
+--- 417,427 ----
+  http://us.imdb.com/title/tt0137494/
+  . (Mark Brader, 2009-10-02)
+  
++ 
  • 
++ In "The Todd Couple" episode of "Outsourced" (first aired 2011-02-10),
++ Manmeet sets up teledates for 6:00 and 9:00;
++ since one is with a New Yorker and the other with a San Franciscan,
++ hilarity ensues.
+  
    • 
+  
+  
    
+diff -r -c tzdata2011b/zone.tab tzdata2011b/zone.tab
+*** tzdata2011b/zone.tab	Wed Jan 26 18:47:09 2011
+--- tzdata2011b/zone.tab	Wed Feb  9 14:00:33 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)zone.tab	8.40
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  #
+--- 1,5 ----
+  # 
    +! # @(#)zone.tab	8.41
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  #
+***************
+*** 412,420 ****
+--- 412,422 ----
+  US	+340308-1181434	America/Los_Angeles	Pacific Time
+  US	+611305-1495401	America/Anchorage	Alaska Time
+  US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
++ US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+  US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+  US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+  US	+515248-1763929	America/Adak	Aleutian Islands
++ US	+550737-1313435	America/Metlakatla	Metlakatla Time - Annette Island
+  US	+211825-1575130	Pacific/Honolulu	Hawaii
+  UY	-3453-05611	America/Montevideo
+  UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+
diff --git a/tzdata.spec b/tzdata.spec
index 83ab7a6..fb3f34e 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011b
 %define tzdata_version 2011b
 %define tzcode_version 2011b
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,6 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
+Patch1: tzdata-2011b-c.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
+%patch1 -p0
 # __end
 
 mkdir javazic
@@ -111,6 +113,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Mar 03 2011 Petr Machata  - 2011b-3
+- Update of historical stamps for Juneau, Sitka, and histcurrent stamps
+  for Metlakatla.  Sitka and Metlakatla are new zones.
+- Delay end of DST in Chile in 2011 until first Sunday in April. (tzdata-2010b-c.patch)
+
 * Wed Feb 09 2011 Fedora Release Engineering  - 2011b-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From 15a238a46e6491d3930efe4216fffaf296ab0e35 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Thu, 3 Mar 2011 23:32:10 +0100
Subject: [PATCH 123/280] Add tentative 2011c for Chile change

- Update of historical stamps for Juneau, Sitka, and histcurrent stamps
  for Metlakatla.  Sitka and Metlakatla are new zones.
- Delay end of DST in Chile in 2011 until first Sunday in April.
---
 .gitignore           |   2 +
 tzdata-2011b-c.patch | 303 +++++++++++++++++++++++++++++++++++++++++++
 tzdata.spec          |   9 +-
 3 files changed, 313 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011b-c.patch

diff --git a/.gitignore b/.gitignore
index dfaac61..1374d86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,5 @@ tzdata2010l.tar.gz
 /tzdata2010o.tar.gz
 /tzdata2011a.tar.gz
 /tzcode2011a.tar.gz
+tzdata/
+*.rpm
diff --git a/tzdata-2011b-c.patch b/tzdata-2011b-c.patch
new file mode 100644
index 0000000..19e6901
--- /dev/null
+++ b/tzdata-2011b-c.patch
@@ -0,0 +1,303 @@
+diff -r -c tzdata2011b/leapseconds tzdata2011b/leapseconds
+*** tzdata2011b/leapseconds	Thu Dec 16 12:24:20 2010
+--- tzdata2011b/leapseconds	Mon Feb 14 09:30:33 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)leapseconds	8.10
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
    +! # @(#)leapseconds	8.11
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 56,68 ****
+  # SERVICE DE LA ROTATION TERRESTRE
+  # OBSERVATOIRE DE PARIS
+  # 61, Av. de l'Observatoire 75014 PARIS (France)
+! # Tel.      : 33 (0) 1 40 51 22 26
+  # FAX       : 33 (0) 1 40 51 22 91
+  # Internet  : services.iers@obspm.fr
+  #
+! # Paris, 14 July 2010
+  #
+! # Bulletin C 40
+  #
+  # To authorities responsible
+  # for the measurement and
+--- 56,68 ----
+  # SERVICE DE LA ROTATION TERRESTRE
+  # OBSERVATOIRE DE PARIS
+  # 61, Av. de l'Observatoire 75014 PARIS (France)
+! # Tel.      : 33 (0) 1 40 51 22 29
+  # FAX       : 33 (0) 1 40 51 22 91
+  # Internet  : services.iers@obspm.fr
+  #
+! # Paris, 2 February 2011
+  #
+! # Bulletin C 41
+  #
+  # To authorities responsible
+  # for the measurement and
+***************
+*** 70,78 ****
+  #
+  # INFORMATION ON UTC - TAI
+  #
+! # NO positive leap second will be introduced at the end of December 2010.
+  # The difference between Coordinated Universal Time UTC and the
+! # International Atomic Time TAI is :
+  #
+  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
+  #
+--- 70,78 ----
+  #
+  # INFORMATION ON UTC - TAI
+  #
+! # NO positive leap second will be introduced at the end of June 2011.
+  # The difference between Coordinated Universal Time UTC and the
+! # International Atomic Time TAI is :		
+  #
+  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
+  #
+***************
+*** 82,87 ****
+  # will be no time step at the next possible date.
+  #
+  # Daniel GAMBIS
+! # Director
+! # Earth Orientation Center of IERS
+  # Observatoire de Paris, France
+--- 82,87 ----
+  # will be no time step at the next possible date.
+  #
+  # Daniel GAMBIS
+! # Head			
+! # Earth Orientation Center of the IERS
+  # Observatoire de Paris, France
+diff -r -c tzdata2011b/northamerica tzdata2011b/northamerica
+*** tzdata2011b/northamerica	Wed Jan 26 17:13:48 2011
+--- tzdata2011b/northamerica	Wed Feb  9 14:00:33 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)northamerica	8.40
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
    +! # @(#)northamerica	8.41
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 426,431 ****
+--- 426,473 ----
+  # were nearby inhabitants in some cases and for our purposes perhaps
+  # it's best to simply use the official transition.
+  #
++ 
++ # From Steve Ferguson (2011-01-31):
++ # The author lives in Alaska and many of the references listed are only
++ # available to Alaskan residents.
++ #
++ # 
++ # http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98
++ # 
++ 
++ # From Arthur David Olson (2011-02-01):
++ # Here's database-relevant material from the 2001 "Alaska History" article:
++ #
++ # On September 20 [1979]...DOT...officials decreed that on April 27,
++ # 1980, Juneau and other nearby communities would move to Yukon Time.
++ # Sitka, Petersburg, Wrangell, and Ketchikan, however, would remain on
++ # Pacific Time.
++ #
++ # ...on September 22, 1980, DOT Secretary Neil E. Goldschmidt rescinded the
++ # Department's September 1979 decision. Juneau and other communities in
++ # northern Southeast reverted to Pacific Time on October 26.
++ #
++ # On October 28 [1983]...the Metlakatla Indian Community Council voted
++ # unanimously to keep the reservation on Pacific Time.
++ #
++ # According to DOT official Joanne Petrie, Indian reservations are not
++ # bound to follow time zones imposed by neighboring jurisdictions.
++ #
++ # (The last is consistent with how the database now handles the Navajo
++ # Nation.)
++ 
++ # From Arthur David Olson (2011-02-09):
++ # I just spoke by phone with a staff member at the Metlakatla Indian
++ # Community office (using contact information available at
++ # 
++ # http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla
++ # ).
++ # It's shortly after 1:00 here on the east coast of the United States;
++ # the staffer said it was shortly after 10:00 there. When I asked whether
++ # that meant they were on Pacific time, they said no--they were on their
++ # own time. I asked about daylight saving; they said it wasn't used. I
++ # did not inquire about practices in the past.
++ 
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+  Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
+  			 -8:57:41 -	LMT	1900 Aug 20 12:00
+***************
+*** 432,440 ****
+--- 474,499 ----
+  			 -8:00	-	PST	1942
+  			 -8:00	US	P%sT	1946
+  			 -8:00	-	PST	1969
++ 			 -8:00	US	P%sT	1980 Apr 27 2:00
++ 			 -9:00	US	Y%sT	1980 Oct 26 2:00	
+  			 -8:00	US	P%sT	1983 Oct 30 2:00
+  			 -9:00	US	Y%sT	1983 Nov 30
+  			 -9:00	US	AK%sT
++ Zone America/Sitka	 -14:58:47 -	LMT	1867 Oct 18
++ 			 -9:01:13 -	LMT	1900 Aug 20 12:00
++ 			 -8:00	-	PST	1942
++ 			 -8:00	US	P%sT	1946
++ 			 -8:00	-	PST	1969
++ 			 -8:00	US	P%sT	1983 Oct 30 2:00
++ 			 -9:00	US	Y%sT	1983 Nov 30
++ 			 -9:00	US	AK%sT
++ Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
++ 			 -8:46:18 -	LMT	1900 Aug 20 12:00
++ 			 -8:00	-	PST	1942
++ 			 -8:00	US	P%sT	1946
++ 			 -8:00	-	PST	1969
++ 			 -8:00	US	P%sT	1983 Oct 30 2:00
++ 			 -8:00	US	MeST
+  Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
+  			 -9:18:55 -	LMT	1900 Aug 20 12:00
+  			 -9:00	-	YST	1942
+diff -r -c tzdata2011b/southamerica tzdata2011b/southamerica
+*** tzdata2011b/southamerica	Thu Dec 16 12:24:20 2010
+--- tzdata2011b/southamerica	Wed Mar  2 12:47:20 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)southamerica	8.44
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
    +! # @(#)southamerica	8.45
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 1154,1159 ****
+--- 1154,1176 ----
+  # From Arthur Daivd Olson (2010-03-06):
+  # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
+  
++ # From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
++ # It appears that the Chilean government has decided to postpone the
++ # change from summer time to winter time again, by three weeks to April
++ # 2nd:
++ # 
++ # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
++ # 
++ #
++ # This is not yet reflected in the offical "cambio de hora" site, but
++ # probably will be soon:
++ # 
++ # http://www.horaoficial.cl/cambio.htm
++ # 
++ 
++ # From Arthur David Olson (2011-03-02):
++ # The emol.com article mentions a water shortage as the cause of the
++ # postponement, which may mean that it's not a permanent change.
+  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+  Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
+  Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
+***************
+*** 1189,1196 ****
+  # which is used below in specifying the transition.
+  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+! Rule	Chile	2010	only	-	Apr	 4	3:00u	0	-
+! Rule	Chile	2011	max	-	Mar	Sun>=9	3:00u	0	-
+  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+  # (1996-09) says 1998-03-08.  Ignore these.
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+--- 1206,1213 ----
+  # which is used below in specifying the transition.
+  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+! Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
+! Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
+  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+  # (1996-09) says 1998-03-08.  Ignore these.
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+diff -r -c tzdata2011b/tz-art.htm tzdata2011b/tz-art.htm
+*** tzcode2011b/tz-art.htm	Wed Jan 19 13:47:16 2011
+--- tzcode2011b/tz-art.htm	Mon Feb 14 16:22:50 2011
+***************
+*** 9,15 ****
+  
+  
    Time and the Arts
    
+  
    
+! @(#)tz-art.htm	8.19
+  
    
+  
    
+  This file is in the public domain, so clarified as of
+--- 9,15 ----
+  
+  
    Time and the Arts
    
+  
    
+! @(#)tz-art.htm	8.20
+  
    
+  
    
+  This file is in the public domain, so clarified as of
+***************
+*** 417,422 ****
+--- 417,427 ----
+  http://us.imdb.com/title/tt0137494/
+  . (Mark Brader, 2009-10-02)
+  
++ 
  • 
++ In "The Todd Couple" episode of "Outsourced" (first aired 2011-02-10),
++ Manmeet sets up teledates for 6:00 and 9:00;
++ since one is with a New Yorker and the other with a San Franciscan,
++ hilarity ensues.
+  
    • 
+  
+  
    
+diff -r -c tzdata2011b/zone.tab tzdata2011b/zone.tab
+*** tzdata2011b/zone.tab	Wed Jan 26 18:47:09 2011
+--- tzdata2011b/zone.tab	Wed Feb  9 14:00:33 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)zone.tab	8.40
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  #
+--- 1,5 ----
+  # 
    +! # @(#)zone.tab	8.41
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  #
+***************
+*** 412,420 ****
+--- 412,422 ----
+  US	+340308-1181434	America/Los_Angeles	Pacific Time
+  US	+611305-1495401	America/Anchorage	Alaska Time
+  US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
++ US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+  US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+  US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+  US	+515248-1763929	America/Adak	Aleutian Islands
++ US	+550737-1313435	America/Metlakatla	Metlakatla Time - Annette Island
+  US	+211825-1575130	Pacific/Honolulu	Hawaii
+  UY	-3453-05611	America/Montevideo
+  UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+
diff --git a/tzdata.spec b/tzdata.spec
index 9dbb1fd..aed5a0e 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011b
 %define tzdata_version 2011b
 %define tzcode_version 2011b
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,6 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
+Patch1: tzdata-2011b-c.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
+%patch1 -p0
 # __end
 
 mkdir javazic
@@ -111,6 +113,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Mar 03 2011 Petr Machata  - 2011b-2
+- Update of historical stamps for Juneau, Sitka, and histcurrent stamps
+  for Metlakatla.  Sitka and Metlakatla are new zones.
+- Delay end of DST in Chile in 2011 until first Sunday in April. (tzdata-2011b-c.patch)
+
 * Wed Feb 09 2011 Petr Machata  - 2011b-1
 - Upstream 2011b:
   - America/North_Dakota/Beulah: Mercer County, North Dakota, changed

From 5adc732cca25b69b2b01fd088cdcb9eab677499e Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 4 Mar 2011 00:17:39 +0100
Subject: [PATCH 124/280] Kemerovo oblast should use OMST/OMSST abbreviation

---
 tzdata-2011b-kemerovo.patch | 14 ++++++++++++++
 tzdata.spec                 |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011b-kemerovo.patch

diff --git a/tzdata-2011b-kemerovo.patch b/tzdata-2011b-kemerovo.patch
new file mode 100644
index 0000000..2310c6e
--- /dev/null
+++ b/tzdata-2011b-kemerovo.patch
@@ -0,0 +1,14 @@
+diff -up tzdata2011b/europe\~ tzdata2011b/europe
+--- tzdata2011b/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011b/europe	2011-03-04 00:11:25.000000000 +0100
+@@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
+ 			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
+ 			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
+ 			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
+-			 6:00	Russia	NOV%sT # Novosibirsk/Novokuznetsk Time
++			 6:00	Russia	OMS%sT # Novosibirsk/Novokuznetsk Time
+ 
+ #
+ # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+
+Diff finished.  Fri Mar  4 00:11:35 2011
diff --git a/tzdata.spec b/tzdata.spec
index fb3f34e..168d909 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011b
 %define tzdata_version 2011b
 %define tzcode_version 2011b
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -18,6 +18,7 @@ Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011b-c.patch
+Patch2: tzdata-2011b-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Fri Mar 04 2011 Petr Machata  - 2011b-4
+- Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)
+
 * Thu Mar 03 2011 Petr Machata  - 2011b-3
 - Update of historical stamps for Juneau, Sitka, and histcurrent stamps
   for Metlakatla.  Sitka and Metlakatla are new zones.

From 17d416e8d2055632f6aa469268733fe52bbc428e Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 4 Mar 2011 00:18:19 +0100
Subject: [PATCH 125/280] Kemerovo oblast should use OMST/OMSST abbreviation

---
 tzdata-2011b-kemerovo.patch | 14 ++++++++++++++
 tzdata.spec                 |  9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011b-kemerovo.patch

diff --git a/tzdata-2011b-kemerovo.patch b/tzdata-2011b-kemerovo.patch
new file mode 100644
index 0000000..2310c6e
--- /dev/null
+++ b/tzdata-2011b-kemerovo.patch
@@ -0,0 +1,14 @@
+diff -up tzdata2011b/europe\~ tzdata2011b/europe
+--- tzdata2011b/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011b/europe	2011-03-04 00:11:25.000000000 +0100
+@@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
+ 			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
+ 			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
+ 			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
+-			 6:00	Russia	NOV%sT # Novosibirsk/Novokuznetsk Time
++			 6:00	Russia	OMS%sT # Novosibirsk/Novokuznetsk Time
+ 
+ #
+ # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+
+Diff finished.  Fri Mar  4 00:11:35 2011
diff --git a/tzdata.spec b/tzdata.spec
index fb3f34e..a2b270c 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011b
 %define tzdata_version 2011b
 %define tzcode_version 2011b
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -18,6 +18,7 @@ Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011b-c.patch
+Patch2: tzdata-2011b-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Fri Mar 04 2011 Petr Machata  - 2011b-4
+
+- Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)
+
+
 * Thu Mar 03 2011 Petr Machata  - 2011b-3
 - Update of historical stamps for Juneau, Sitka, and histcurrent stamps
   for Metlakatla.  Sitka and Metlakatla are new zones.

From b59a1b09d251af1cbf6e212de24913f738939e95 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 4 Mar 2011 00:18:38 +0100
Subject: [PATCH 126/280] Kemerovo oblast should use OMST/OMSST abbreviation

---
 tzdata-2011b-kemerovo.patch | 14 ++++++++++++++
 tzdata.spec                 |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011b-kemerovo.patch

diff --git a/tzdata-2011b-kemerovo.patch b/tzdata-2011b-kemerovo.patch
new file mode 100644
index 0000000..2310c6e
--- /dev/null
+++ b/tzdata-2011b-kemerovo.patch
@@ -0,0 +1,14 @@
+diff -up tzdata2011b/europe\~ tzdata2011b/europe
+--- tzdata2011b/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011b/europe	2011-03-04 00:11:25.000000000 +0100
+@@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
+ 			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
+ 			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
+ 			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
+-			 6:00	Russia	NOV%sT # Novosibirsk/Novokuznetsk Time
++			 6:00	Russia	OMS%sT # Novosibirsk/Novokuznetsk Time
+ 
+ #
+ # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+
+Diff finished.  Fri Mar  4 00:11:35 2011
diff --git a/tzdata.spec b/tzdata.spec
index aed5a0e..4478068 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011b
 %define tzdata_version 2011b
 %define tzcode_version 2011b
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -18,6 +18,7 @@ Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011b-c.patch
+Patch2: tzdata-2011b-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Fri Mar 04 2011 Petr Machata  - 2011b-3
+- Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)
+
 * Thu Mar 03 2011 Petr Machata  - 2011b-2
 - Update of historical stamps for Juneau, Sitka, and histcurrent stamps
   for Metlakatla.  Sitka and Metlakatla are new zones.

From a6ebaa9169bdba00ea0dc6c768ccf974ef53f9cf Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 15 Mar 2011 10:40:05 +0100
Subject: [PATCH 127/280] Upstream 2011d

- Change end of DST in Samoa in 2011.
- Change start of DST in Cuba in 2011.
- Move start of DST in Turkey by one day in 2011.
---
 .gitignore                                    |   2 +
 sources                                       |   4 +-
 tzdata-2011b-c.patch                          | 303 ------------------
 ...erovo.patch => tzdata-2011d-kemerovo.patch |   4 +-
 tzdata.spec                                   |  19 +-
 5 files changed, 18 insertions(+), 314 deletions(-)
 delete mode 100644 tzdata-2011b-c.patch
 rename tzdata-2011b-kemerovo.patch => tzdata-2011d-kemerovo.patch (79%)

diff --git a/.gitignore b/.gitignore
index c031c4a..43b23e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,5 @@ tzdata2010l.tar.gz
 /tzcode2011b.tar.gz
 tzdata/
 *.rpm
+/tzdata2011d.tar.gz
+/tzcode2011d.tar.gz
diff --git a/sources b/sources
index 1d8dadd..4e8ee12 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-9eaf3ca354c42a32bd28e623539bf0e0  tzdata2011b.tar.gz
-c63a1425f7252aef1fe54a258cdccff8  tzcode2011b.tar.gz
+03c5793502b7c41985edd73146bf7e36  tzdata2011d.tar.gz
+95095242ee368e6a7e107f154590ac11  tzcode2011d.tar.gz
diff --git a/tzdata-2011b-c.patch b/tzdata-2011b-c.patch
deleted file mode 100644
index 19e6901..0000000
--- a/tzdata-2011b-c.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-diff -r -c tzdata2011b/leapseconds tzdata2011b/leapseconds
-*** tzdata2011b/leapseconds	Thu Dec 16 12:24:20 2010
---- tzdata2011b/leapseconds	Mon Feb 14 09:30:33 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)leapseconds	8.10
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)leapseconds	8.11
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 56,68 ****
-  # SERVICE DE LA ROTATION TERRESTRE
-  # OBSERVATOIRE DE PARIS
-  # 61, Av. de l'Observatoire 75014 PARIS (France)
-! # Tel.      : 33 (0) 1 40 51 22 26
-  # FAX       : 33 (0) 1 40 51 22 91
-  # Internet  : services.iers@obspm.fr
-  #
-! # Paris, 14 July 2010
-  #
-! # Bulletin C 40
-  #
-  # To authorities responsible
-  # for the measurement and
---- 56,68 ----
-  # SERVICE DE LA ROTATION TERRESTRE
-  # OBSERVATOIRE DE PARIS
-  # 61, Av. de l'Observatoire 75014 PARIS (France)
-! # Tel.      : 33 (0) 1 40 51 22 29
-  # FAX       : 33 (0) 1 40 51 22 91
-  # Internet  : services.iers@obspm.fr
-  #
-! # Paris, 2 February 2011
-  #
-! # Bulletin C 41
-  #
-  # To authorities responsible
-  # for the measurement and
-***************
-*** 70,78 ****
-  #
-  # INFORMATION ON UTC - TAI
-  #
-! # NO positive leap second will be introduced at the end of December 2010.
-  # The difference between Coordinated Universal Time UTC and the
-! # International Atomic Time TAI is :
-  #
-  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
-  #
---- 70,78 ----
-  #
-  # INFORMATION ON UTC - TAI
-  #
-! # NO positive leap second will be introduced at the end of June 2011.
-  # The difference between Coordinated Universal Time UTC and the
-! # International Atomic Time TAI is :		
-  #
-  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
-  #
-***************
-*** 82,87 ****
-  # will be no time step at the next possible date.
-  #
-  # Daniel GAMBIS
-! # Director
-! # Earth Orientation Center of IERS
-  # Observatoire de Paris, France
---- 82,87 ----
-  # will be no time step at the next possible date.
-  #
-  # Daniel GAMBIS
-! # Head			
-! # Earth Orientation Center of the IERS
-  # Observatoire de Paris, France
-diff -r -c tzdata2011b/northamerica tzdata2011b/northamerica
-*** tzdata2011b/northamerica	Wed Jan 26 17:13:48 2011
---- tzdata2011b/northamerica	Wed Feb  9 14:00:33 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)northamerica	8.40
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)northamerica	8.41
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 426,431 ****
---- 426,473 ----
-  # were nearby inhabitants in some cases and for our purposes perhaps
-  # it's best to simply use the official transition.
-  #
-+ 
-+ # From Steve Ferguson (2011-01-31):
-+ # The author lives in Alaska and many of the references listed are only
-+ # available to Alaskan residents.
-+ #
-+ # 
-+ # http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98
-+ # 
-+ 
-+ # From Arthur David Olson (2011-02-01):
-+ # Here's database-relevant material from the 2001 "Alaska History" article:
-+ #
-+ # On September 20 [1979]...DOT...officials decreed that on April 27,
-+ # 1980, Juneau and other nearby communities would move to Yukon Time.
-+ # Sitka, Petersburg, Wrangell, and Ketchikan, however, would remain on
-+ # Pacific Time.
-+ #
-+ # ...on September 22, 1980, DOT Secretary Neil E. Goldschmidt rescinded the
-+ # Department's September 1979 decision. Juneau and other communities in
-+ # northern Southeast reverted to Pacific Time on October 26.
-+ #
-+ # On October 28 [1983]...the Metlakatla Indian Community Council voted
-+ # unanimously to keep the reservation on Pacific Time.
-+ #
-+ # According to DOT official Joanne Petrie, Indian reservations are not
-+ # bound to follow time zones imposed by neighboring jurisdictions.
-+ #
-+ # (The last is consistent with how the database now handles the Navajo
-+ # Nation.)
-+ 
-+ # From Arthur David Olson (2011-02-09):
-+ # I just spoke by phone with a staff member at the Metlakatla Indian
-+ # Community office (using contact information available at
-+ # 
-+ # http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla
-+ # ).
-+ # It's shortly after 1:00 here on the east coast of the United States;
-+ # the staffer said it was shortly after 10:00 there. When I asked whether
-+ # that meant they were on Pacific time, they said no--they were on their
-+ # own time. I asked about daylight saving; they said it wasn't used. I
-+ # did not inquire about practices in the past.
-+ 
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
-  			 -8:57:41 -	LMT	1900 Aug 20 12:00
-***************
-*** 432,440 ****
---- 474,499 ----
-  			 -8:00	-	PST	1942
-  			 -8:00	US	P%sT	1946
-  			 -8:00	-	PST	1969
-+ 			 -8:00	US	P%sT	1980 Apr 27 2:00
-+ 			 -9:00	US	Y%sT	1980 Oct 26 2:00	
-  			 -8:00	US	P%sT	1983 Oct 30 2:00
-  			 -9:00	US	Y%sT	1983 Nov 30
-  			 -9:00	US	AK%sT
-+ Zone America/Sitka	 -14:58:47 -	LMT	1867 Oct 18
-+ 			 -9:01:13 -	LMT	1900 Aug 20 12:00
-+ 			 -8:00	-	PST	1942
-+ 			 -8:00	US	P%sT	1946
-+ 			 -8:00	-	PST	1969
-+ 			 -8:00	US	P%sT	1983 Oct 30 2:00
-+ 			 -9:00	US	Y%sT	1983 Nov 30
-+ 			 -9:00	US	AK%sT
-+ Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
-+ 			 -8:46:18 -	LMT	1900 Aug 20 12:00
-+ 			 -8:00	-	PST	1942
-+ 			 -8:00	US	P%sT	1946
-+ 			 -8:00	-	PST	1969
-+ 			 -8:00	US	P%sT	1983 Oct 30 2:00
-+ 			 -8:00	US	MeST
-  Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
-  			 -9:18:55 -	LMT	1900 Aug 20 12:00
-  			 -9:00	-	YST	1942
-diff -r -c tzdata2011b/southamerica tzdata2011b/southamerica
-*** tzdata2011b/southamerica	Thu Dec 16 12:24:20 2010
---- tzdata2011b/southamerica	Wed Mar  2 12:47:20 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)southamerica	8.44
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)southamerica	8.45
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 1154,1159 ****
---- 1154,1176 ----
-  # From Arthur Daivd Olson (2010-03-06):
-  # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
-  
-+ # From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
-+ # It appears that the Chilean government has decided to postpone the
-+ # change from summer time to winter time again, by three weeks to April
-+ # 2nd:
-+ # 
-+ # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
-+ # 
-+ #
-+ # This is not yet reflected in the offical "cambio de hora" site, but
-+ # probably will be soon:
-+ # 
-+ # http://www.horaoficial.cl/cambio.htm
-+ # 
-+ 
-+ # From Arthur David Olson (2011-03-02):
-+ # The emol.com article mentions a water shortage as the cause of the
-+ # postponement, which may mean that it's not a permanent change.
-  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-  Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
-  Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
-***************
-*** 1189,1196 ****
-  # which is used below in specifying the transition.
-  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
-  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
-! Rule	Chile	2010	only	-	Apr	 4	3:00u	0	-
-! Rule	Chile	2011	max	-	Mar	Sun>=9	3:00u	0	-
-  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
-  # (1996-09) says 1998-03-08.  Ignore these.
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
---- 1206,1213 ----
-  # which is used below in specifying the transition.
-  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
-  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
-! Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
-! Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
-  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
-  # (1996-09) says 1998-03-08.  Ignore these.
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-diff -r -c tzdata2011b/tz-art.htm tzdata2011b/tz-art.htm
-*** tzcode2011b/tz-art.htm	Wed Jan 19 13:47:16 2011
---- tzcode2011b/tz-art.htm	Mon Feb 14 16:22:50 2011
-***************
-*** 9,15 ****
-  
-  
    Time and the Arts
    
-  
    
-! @(#)tz-art.htm	8.19
-  
    
-  
    
-  This file is in the public domain, so clarified as of
---- 9,15 ----
-  
-  
    Time and the Arts
    
-  
    
-! @(#)tz-art.htm	8.20
-  
    
-  
    
-  This file is in the public domain, so clarified as of
-***************
-*** 417,422 ****
---- 417,427 ----
-  http://us.imdb.com/title/tt0137494/
-  . (Mark Brader, 2009-10-02)
-  
-+ 
  • 
-+ In "The Todd Couple" episode of "Outsourced" (first aired 2011-02-10),
-+ Manmeet sets up teledates for 6:00 and 9:00;
-+ since one is with a New Yorker and the other with a San Franciscan,
-+ hilarity ensues.
-  
    • 
-  
-  
    
-diff -r -c tzdata2011b/zone.tab tzdata2011b/zone.tab
-*** tzdata2011b/zone.tab	Wed Jan 26 18:47:09 2011
---- tzdata2011b/zone.tab	Wed Feb  9 14:00:33 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)zone.tab	8.40
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
---- 1,5 ----
-  # 
    -! # @(#)zone.tab	8.41
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
-***************
-*** 412,420 ****
---- 412,422 ----
-  US	+340308-1181434	America/Los_Angeles	Pacific Time
-  US	+611305-1495401	America/Anchorage	Alaska Time
-  US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
-+ US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
-  US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
-  US	+643004-1652423	America/Nome	Alaska Time - west Alaska
-  US	+515248-1763929	America/Adak	Aleutian Islands
-+ US	+550737-1313435	America/Metlakatla	Metlakatla Time - Annette Island
-  US	+211825-1575130	Pacific/Honolulu	Hawaii
-  UY	-3453-05611	America/Montevideo
-  UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
-
diff --git a/tzdata-2011b-kemerovo.patch b/tzdata-2011d-kemerovo.patch
similarity index 79%
rename from tzdata-2011b-kemerovo.patch
rename to tzdata-2011d-kemerovo.patch
index 2310c6e..7c4fecd 100644
--- a/tzdata-2011b-kemerovo.patch
+++ b/tzdata-2011d-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011b/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011b/europe	2011-03-04 00:11:25.000000000 +0100
+--- tzdata2011d/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011d/europe	2011-03-04 00:11:25.000000000 +0100
 @@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index 168d909..ea8d4dd 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011b
-%define tzdata_version 2011b
-%define tzcode_version 2011b
-Release: 4%{?dist}
+Version: 2011d
+%define tzdata_version 2011d
+%define tzcode_version 2011d
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,8 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011b-c.patch
-Patch2: tzdata-2011b-kemerovo.patch
+Patch1: tzdata-2011d-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +113,13 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Mar 15 2011 Petr Machata  - 2011d-1
+- Upstream 2011d:
+  - Change end of DST in Samoa in 2011.
+  - Change start of DST in Cuba in 2011.
+  - Move start of DST in Turkey by one day in 2011.
+- Dropped tzdata-2011b-c.patch
+
 * Fri Mar 04 2011 Petr Machata  - 2011b-4
 - Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)
 

From 6acf2886832fbf053442dbe84bb2060d493ff7ae Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 15 Mar 2011 10:42:19 +0100
Subject: [PATCH 128/280] Upstream 2011d:

- Change end of DST in Samoa in 2011.
- Change start of DST in Cuba in 2011.
- Move start of DST in Turkey by one day in 2011.
---
 sources                                       |   4 +-
 tzdata-2011b-c.patch                          | 303 ------------------
 ...erovo.patch => tzdata-2011d-kemerovo.patch |   4 +-
 tzdata.spec                                   |  21 +-
 4 files changed, 16 insertions(+), 316 deletions(-)
 delete mode 100644 tzdata-2011b-c.patch
 rename tzdata-2011b-kemerovo.patch => tzdata-2011d-kemerovo.patch (79%)

diff --git a/sources b/sources
index 1d8dadd..4e8ee12 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-9eaf3ca354c42a32bd28e623539bf0e0  tzdata2011b.tar.gz
-c63a1425f7252aef1fe54a258cdccff8  tzcode2011b.tar.gz
+03c5793502b7c41985edd73146bf7e36  tzdata2011d.tar.gz
+95095242ee368e6a7e107f154590ac11  tzcode2011d.tar.gz
diff --git a/tzdata-2011b-c.patch b/tzdata-2011b-c.patch
deleted file mode 100644
index 19e6901..0000000
--- a/tzdata-2011b-c.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-diff -r -c tzdata2011b/leapseconds tzdata2011b/leapseconds
-*** tzdata2011b/leapseconds	Thu Dec 16 12:24:20 2010
---- tzdata2011b/leapseconds	Mon Feb 14 09:30:33 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)leapseconds	8.10
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)leapseconds	8.11
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 56,68 ****
-  # SERVICE DE LA ROTATION TERRESTRE
-  # OBSERVATOIRE DE PARIS
-  # 61, Av. de l'Observatoire 75014 PARIS (France)
-! # Tel.      : 33 (0) 1 40 51 22 26
-  # FAX       : 33 (0) 1 40 51 22 91
-  # Internet  : services.iers@obspm.fr
-  #
-! # Paris, 14 July 2010
-  #
-! # Bulletin C 40
-  #
-  # To authorities responsible
-  # for the measurement and
---- 56,68 ----
-  # SERVICE DE LA ROTATION TERRESTRE
-  # OBSERVATOIRE DE PARIS
-  # 61, Av. de l'Observatoire 75014 PARIS (France)
-! # Tel.      : 33 (0) 1 40 51 22 29
-  # FAX       : 33 (0) 1 40 51 22 91
-  # Internet  : services.iers@obspm.fr
-  #
-! # Paris, 2 February 2011
-  #
-! # Bulletin C 41
-  #
-  # To authorities responsible
-  # for the measurement and
-***************
-*** 70,78 ****
-  #
-  # INFORMATION ON UTC - TAI
-  #
-! # NO positive leap second will be introduced at the end of December 2010.
-  # The difference between Coordinated Universal Time UTC and the
-! # International Atomic Time TAI is :
-  #
-  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
-  #
---- 70,78 ----
-  #
-  # INFORMATION ON UTC - TAI
-  #
-! # NO positive leap second will be introduced at the end of June 2011.
-  # The difference between Coordinated Universal Time UTC and the
-! # International Atomic Time TAI is :		
-  #
-  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
-  #
-***************
-*** 82,87 ****
-  # will be no time step at the next possible date.
-  #
-  # Daniel GAMBIS
-! # Director
-! # Earth Orientation Center of IERS
-  # Observatoire de Paris, France
---- 82,87 ----
-  # will be no time step at the next possible date.
-  #
-  # Daniel GAMBIS
-! # Head			
-! # Earth Orientation Center of the IERS
-  # Observatoire de Paris, France
-diff -r -c tzdata2011b/northamerica tzdata2011b/northamerica
-*** tzdata2011b/northamerica	Wed Jan 26 17:13:48 2011
---- tzdata2011b/northamerica	Wed Feb  9 14:00:33 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)northamerica	8.40
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)northamerica	8.41
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 426,431 ****
---- 426,473 ----
-  # were nearby inhabitants in some cases and for our purposes perhaps
-  # it's best to simply use the official transition.
-  #
-+ 
-+ # From Steve Ferguson (2011-01-31):
-+ # The author lives in Alaska and many of the references listed are only
-+ # available to Alaskan residents.
-+ #
-+ # 
-+ # http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98
-+ # 
-+ 
-+ # From Arthur David Olson (2011-02-01):
-+ # Here's database-relevant material from the 2001 "Alaska History" article:
-+ #
-+ # On September 20 [1979]...DOT...officials decreed that on April 27,
-+ # 1980, Juneau and other nearby communities would move to Yukon Time.
-+ # Sitka, Petersburg, Wrangell, and Ketchikan, however, would remain on
-+ # Pacific Time.
-+ #
-+ # ...on September 22, 1980, DOT Secretary Neil E. Goldschmidt rescinded the
-+ # Department's September 1979 decision. Juneau and other communities in
-+ # northern Southeast reverted to Pacific Time on October 26.
-+ #
-+ # On October 28 [1983]...the Metlakatla Indian Community Council voted
-+ # unanimously to keep the reservation on Pacific Time.
-+ #
-+ # According to DOT official Joanne Petrie, Indian reservations are not
-+ # bound to follow time zones imposed by neighboring jurisdictions.
-+ #
-+ # (The last is consistent with how the database now handles the Navajo
-+ # Nation.)
-+ 
-+ # From Arthur David Olson (2011-02-09):
-+ # I just spoke by phone with a staff member at the Metlakatla Indian
-+ # Community office (using contact information available at
-+ # 
-+ # http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla
-+ # ).
-+ # It's shortly after 1:00 here on the east coast of the United States;
-+ # the staffer said it was shortly after 10:00 there. When I asked whether
-+ # that meant they were on Pacific time, they said no--they were on their
-+ # own time. I asked about daylight saving; they said it wasn't used. I
-+ # did not inquire about practices in the past.
-+ 
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
-  			 -8:57:41 -	LMT	1900 Aug 20 12:00
-***************
-*** 432,440 ****
---- 474,499 ----
-  			 -8:00	-	PST	1942
-  			 -8:00	US	P%sT	1946
-  			 -8:00	-	PST	1969
-+ 			 -8:00	US	P%sT	1980 Apr 27 2:00
-+ 			 -9:00	US	Y%sT	1980 Oct 26 2:00	
-  			 -8:00	US	P%sT	1983 Oct 30 2:00
-  			 -9:00	US	Y%sT	1983 Nov 30
-  			 -9:00	US	AK%sT
-+ Zone America/Sitka	 -14:58:47 -	LMT	1867 Oct 18
-+ 			 -9:01:13 -	LMT	1900 Aug 20 12:00
-+ 			 -8:00	-	PST	1942
-+ 			 -8:00	US	P%sT	1946
-+ 			 -8:00	-	PST	1969
-+ 			 -8:00	US	P%sT	1983 Oct 30 2:00
-+ 			 -9:00	US	Y%sT	1983 Nov 30
-+ 			 -9:00	US	AK%sT
-+ Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
-+ 			 -8:46:18 -	LMT	1900 Aug 20 12:00
-+ 			 -8:00	-	PST	1942
-+ 			 -8:00	US	P%sT	1946
-+ 			 -8:00	-	PST	1969
-+ 			 -8:00	US	P%sT	1983 Oct 30 2:00
-+ 			 -8:00	US	MeST
-  Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
-  			 -9:18:55 -	LMT	1900 Aug 20 12:00
-  			 -9:00	-	YST	1942
-diff -r -c tzdata2011b/southamerica tzdata2011b/southamerica
-*** tzdata2011b/southamerica	Thu Dec 16 12:24:20 2010
---- tzdata2011b/southamerica	Wed Mar  2 12:47:20 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)southamerica	8.44
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)southamerica	8.45
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 1154,1159 ****
---- 1154,1176 ----
-  # From Arthur Daivd Olson (2010-03-06):
-  # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
-  
-+ # From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
-+ # It appears that the Chilean government has decided to postpone the
-+ # change from summer time to winter time again, by three weeks to April
-+ # 2nd:
-+ # 
-+ # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
-+ # 
-+ #
-+ # This is not yet reflected in the offical "cambio de hora" site, but
-+ # probably will be soon:
-+ # 
-+ # http://www.horaoficial.cl/cambio.htm
-+ # 
-+ 
-+ # From Arthur David Olson (2011-03-02):
-+ # The emol.com article mentions a water shortage as the cause of the
-+ # postponement, which may mean that it's not a permanent change.
-  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-  Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
-  Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
-***************
-*** 1189,1196 ****
-  # which is used below in specifying the transition.
-  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
-  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
-! Rule	Chile	2010	only	-	Apr	 4	3:00u	0	-
-! Rule	Chile	2011	max	-	Mar	Sun>=9	3:00u	0	-
-  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
-  # (1996-09) says 1998-03-08.  Ignore these.
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
---- 1206,1213 ----
-  # which is used below in specifying the transition.
-  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
-  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
-! Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
-! Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
-  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
-  # (1996-09) says 1998-03-08.  Ignore these.
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-diff -r -c tzdata2011b/tz-art.htm tzdata2011b/tz-art.htm
-*** tzcode2011b/tz-art.htm	Wed Jan 19 13:47:16 2011
---- tzcode2011b/tz-art.htm	Mon Feb 14 16:22:50 2011
-***************
-*** 9,15 ****
-  
-  
    Time and the Arts
    
-  
    
-! @(#)tz-art.htm	8.19
-  
    
-  
    
-  This file is in the public domain, so clarified as of
---- 9,15 ----
-  
-  
    Time and the Arts
    
-  
    
-! @(#)tz-art.htm	8.20
-  
    
-  
    
-  This file is in the public domain, so clarified as of
-***************
-*** 417,422 ****
---- 417,427 ----
-  http://us.imdb.com/title/tt0137494/
-  . (Mark Brader, 2009-10-02)
-  
-+ 
  • 
-+ In "The Todd Couple" episode of "Outsourced" (first aired 2011-02-10),
-+ Manmeet sets up teledates for 6:00 and 9:00;
-+ since one is with a New Yorker and the other with a San Franciscan,
-+ hilarity ensues.
-  
    • 
-  
-  
    
-diff -r -c tzdata2011b/zone.tab tzdata2011b/zone.tab
-*** tzdata2011b/zone.tab	Wed Jan 26 18:47:09 2011
---- tzdata2011b/zone.tab	Wed Feb  9 14:00:33 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)zone.tab	8.40
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
---- 1,5 ----
-  # 
    -! # @(#)zone.tab	8.41
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
-***************
-*** 412,420 ****
---- 412,422 ----
-  US	+340308-1181434	America/Los_Angeles	Pacific Time
-  US	+611305-1495401	America/Anchorage	Alaska Time
-  US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
-+ US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
-  US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
-  US	+643004-1652423	America/Nome	Alaska Time - west Alaska
-  US	+515248-1763929	America/Adak	Aleutian Islands
-+ US	+550737-1313435	America/Metlakatla	Metlakatla Time - Annette Island
-  US	+211825-1575130	Pacific/Honolulu	Hawaii
-  UY	-3453-05611	America/Montevideo
-  UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
-
diff --git a/tzdata-2011b-kemerovo.patch b/tzdata-2011d-kemerovo.patch
similarity index 79%
rename from tzdata-2011b-kemerovo.patch
rename to tzdata-2011d-kemerovo.patch
index 2310c6e..7c4fecd 100644
--- a/tzdata-2011b-kemerovo.patch
+++ b/tzdata-2011d-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011b/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011b/europe	2011-03-04 00:11:25.000000000 +0100
+--- tzdata2011d/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011d/europe	2011-03-04 00:11:25.000000000 +0100
 @@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index a2b270c..ea8d4dd 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011b
-%define tzdata_version 2011b
-%define tzcode_version 2011b
-Release: 4%{?dist}
+Version: 2011d
+%define tzdata_version 2011d
+%define tzcode_version 2011d
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,8 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011b-c.patch
-Patch2: tzdata-2011b-kemerovo.patch
+Patch1: tzdata-2011d-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
 # __end
 
 mkdir javazic
@@ -115,11 +113,16 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Mar 15 2011 Petr Machata  - 2011d-1
+- Upstream 2011d:
+  - Change end of DST in Samoa in 2011.
+  - Change start of DST in Cuba in 2011.
+  - Move start of DST in Turkey by one day in 2011.
+- Dropped tzdata-2011b-c.patch
+
 * Fri Mar 04 2011 Petr Machata  - 2011b-4
-
 - Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)
 
-
 * Thu Mar 03 2011 Petr Machata  - 2011b-3
 - Update of historical stamps for Juneau, Sitka, and histcurrent stamps
   for Metlakatla.  Sitka and Metlakatla are new zones.

From e32ddc25e663e554a7ac01125acbda6311dbef7f Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 15 Mar 2011 10:44:21 +0100
Subject: [PATCH 129/280] Upstream 2011d

- Change end of DST in Samoa in 2011.
- Change start of DST in Cuba in 2011.
- Move start of DST in Turkey by one day in 2011.
---
 sources                                       |   4 +-
 tzdata-2011b-c.patch                          | 303 ------------------
 ...erovo.patch => tzdata-2011d-kemerovo.patch |   4 +-
 tzdata.spec                                   |  19 +-
 4 files changed, 16 insertions(+), 314 deletions(-)
 delete mode 100644 tzdata-2011b-c.patch
 rename tzdata-2011b-kemerovo.patch => tzdata-2011d-kemerovo.patch (79%)

diff --git a/sources b/sources
index 1d8dadd..4e8ee12 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-9eaf3ca354c42a32bd28e623539bf0e0  tzdata2011b.tar.gz
-c63a1425f7252aef1fe54a258cdccff8  tzcode2011b.tar.gz
+03c5793502b7c41985edd73146bf7e36  tzdata2011d.tar.gz
+95095242ee368e6a7e107f154590ac11  tzcode2011d.tar.gz
diff --git a/tzdata-2011b-c.patch b/tzdata-2011b-c.patch
deleted file mode 100644
index 19e6901..0000000
--- a/tzdata-2011b-c.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-diff -r -c tzdata2011b/leapseconds tzdata2011b/leapseconds
-*** tzdata2011b/leapseconds	Thu Dec 16 12:24:20 2010
---- tzdata2011b/leapseconds	Mon Feb 14 09:30:33 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)leapseconds	8.10
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)leapseconds	8.11
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 56,68 ****
-  # SERVICE DE LA ROTATION TERRESTRE
-  # OBSERVATOIRE DE PARIS
-  # 61, Av. de l'Observatoire 75014 PARIS (France)
-! # Tel.      : 33 (0) 1 40 51 22 26
-  # FAX       : 33 (0) 1 40 51 22 91
-  # Internet  : services.iers@obspm.fr
-  #
-! # Paris, 14 July 2010
-  #
-! # Bulletin C 40
-  #
-  # To authorities responsible
-  # for the measurement and
---- 56,68 ----
-  # SERVICE DE LA ROTATION TERRESTRE
-  # OBSERVATOIRE DE PARIS
-  # 61, Av. de l'Observatoire 75014 PARIS (France)
-! # Tel.      : 33 (0) 1 40 51 22 29
-  # FAX       : 33 (0) 1 40 51 22 91
-  # Internet  : services.iers@obspm.fr
-  #
-! # Paris, 2 February 2011
-  #
-! # Bulletin C 41
-  #
-  # To authorities responsible
-  # for the measurement and
-***************
-*** 70,78 ****
-  #
-  # INFORMATION ON UTC - TAI
-  #
-! # NO positive leap second will be introduced at the end of December 2010.
-  # The difference between Coordinated Universal Time UTC and the
-! # International Atomic Time TAI is :
-  #
-  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
-  #
---- 70,78 ----
-  #
-  # INFORMATION ON UTC - TAI
-  #
-! # NO positive leap second will be introduced at the end of June 2011.
-  # The difference between Coordinated Universal Time UTC and the
-! # International Atomic Time TAI is :		
-  #
-  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
-  #
-***************
-*** 82,87 ****
-  # will be no time step at the next possible date.
-  #
-  # Daniel GAMBIS
-! # Director
-! # Earth Orientation Center of IERS
-  # Observatoire de Paris, France
---- 82,87 ----
-  # will be no time step at the next possible date.
-  #
-  # Daniel GAMBIS
-! # Head			
-! # Earth Orientation Center of the IERS
-  # Observatoire de Paris, France
-diff -r -c tzdata2011b/northamerica tzdata2011b/northamerica
-*** tzdata2011b/northamerica	Wed Jan 26 17:13:48 2011
---- tzdata2011b/northamerica	Wed Feb  9 14:00:33 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)northamerica	8.40
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)northamerica	8.41
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 426,431 ****
---- 426,473 ----
-  # were nearby inhabitants in some cases and for our purposes perhaps
-  # it's best to simply use the official transition.
-  #
-+ 
-+ # From Steve Ferguson (2011-01-31):
-+ # The author lives in Alaska and many of the references listed are only
-+ # available to Alaskan residents.
-+ #
-+ # 
-+ # http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98
-+ # 
-+ 
-+ # From Arthur David Olson (2011-02-01):
-+ # Here's database-relevant material from the 2001 "Alaska History" article:
-+ #
-+ # On September 20 [1979]...DOT...officials decreed that on April 27,
-+ # 1980, Juneau and other nearby communities would move to Yukon Time.
-+ # Sitka, Petersburg, Wrangell, and Ketchikan, however, would remain on
-+ # Pacific Time.
-+ #
-+ # ...on September 22, 1980, DOT Secretary Neil E. Goldschmidt rescinded the
-+ # Department's September 1979 decision. Juneau and other communities in
-+ # northern Southeast reverted to Pacific Time on October 26.
-+ #
-+ # On October 28 [1983]...the Metlakatla Indian Community Council voted
-+ # unanimously to keep the reservation on Pacific Time.
-+ #
-+ # According to DOT official Joanne Petrie, Indian reservations are not
-+ # bound to follow time zones imposed by neighboring jurisdictions.
-+ #
-+ # (The last is consistent with how the database now handles the Navajo
-+ # Nation.)
-+ 
-+ # From Arthur David Olson (2011-02-09):
-+ # I just spoke by phone with a staff member at the Metlakatla Indian
-+ # Community office (using contact information available at
-+ # 
-+ # http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla
-+ # ).
-+ # It's shortly after 1:00 here on the east coast of the United States;
-+ # the staffer said it was shortly after 10:00 there. When I asked whether
-+ # that meant they were on Pacific time, they said no--they were on their
-+ # own time. I asked about daylight saving; they said it wasn't used. I
-+ # did not inquire about practices in the past.
-+ 
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
-  			 -8:57:41 -	LMT	1900 Aug 20 12:00
-***************
-*** 432,440 ****
---- 474,499 ----
-  			 -8:00	-	PST	1942
-  			 -8:00	US	P%sT	1946
-  			 -8:00	-	PST	1969
-+ 			 -8:00	US	P%sT	1980 Apr 27 2:00
-+ 			 -9:00	US	Y%sT	1980 Oct 26 2:00	
-  			 -8:00	US	P%sT	1983 Oct 30 2:00
-  			 -9:00	US	Y%sT	1983 Nov 30
-  			 -9:00	US	AK%sT
-+ Zone America/Sitka	 -14:58:47 -	LMT	1867 Oct 18
-+ 			 -9:01:13 -	LMT	1900 Aug 20 12:00
-+ 			 -8:00	-	PST	1942
-+ 			 -8:00	US	P%sT	1946
-+ 			 -8:00	-	PST	1969
-+ 			 -8:00	US	P%sT	1983 Oct 30 2:00
-+ 			 -9:00	US	Y%sT	1983 Nov 30
-+ 			 -9:00	US	AK%sT
-+ Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
-+ 			 -8:46:18 -	LMT	1900 Aug 20 12:00
-+ 			 -8:00	-	PST	1942
-+ 			 -8:00	US	P%sT	1946
-+ 			 -8:00	-	PST	1969
-+ 			 -8:00	US	P%sT	1983 Oct 30 2:00
-+ 			 -8:00	US	MeST
-  Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
-  			 -9:18:55 -	LMT	1900 Aug 20 12:00
-  			 -9:00	-	YST	1942
-diff -r -c tzdata2011b/southamerica tzdata2011b/southamerica
-*** tzdata2011b/southamerica	Thu Dec 16 12:24:20 2010
---- tzdata2011b/southamerica	Wed Mar  2 12:47:20 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)southamerica	8.44
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)southamerica	8.45
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 1154,1159 ****
---- 1154,1176 ----
-  # From Arthur Daivd Olson (2010-03-06):
-  # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
-  
-+ # From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
-+ # It appears that the Chilean government has decided to postpone the
-+ # change from summer time to winter time again, by three weeks to April
-+ # 2nd:
-+ # 
-+ # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
-+ # 
-+ #
-+ # This is not yet reflected in the offical "cambio de hora" site, but
-+ # probably will be soon:
-+ # 
-+ # http://www.horaoficial.cl/cambio.htm
-+ # 
-+ 
-+ # From Arthur David Olson (2011-03-02):
-+ # The emol.com article mentions a water shortage as the cause of the
-+ # postponement, which may mean that it's not a permanent change.
-  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-  Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
-  Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
-***************
-*** 1189,1196 ****
-  # which is used below in specifying the transition.
-  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
-  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
-! Rule	Chile	2010	only	-	Apr	 4	3:00u	0	-
-! Rule	Chile	2011	max	-	Mar	Sun>=9	3:00u	0	-
-  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
-  # (1996-09) says 1998-03-08.  Ignore these.
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
---- 1206,1213 ----
-  # which is used below in specifying the transition.
-  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
-  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
-! Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
-! Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
-  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
-  # (1996-09) says 1998-03-08.  Ignore these.
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-diff -r -c tzdata2011b/tz-art.htm tzdata2011b/tz-art.htm
-*** tzcode2011b/tz-art.htm	Wed Jan 19 13:47:16 2011
---- tzcode2011b/tz-art.htm	Mon Feb 14 16:22:50 2011
-***************
-*** 9,15 ****
-  
-  
    Time and the Arts
    
-  
    
-! @(#)tz-art.htm	8.19
-  
    
-  
    
-  This file is in the public domain, so clarified as of
---- 9,15 ----
-  
-  
    Time and the Arts
    
-  
    
-! @(#)tz-art.htm	8.20
-  
    
-  
    
-  This file is in the public domain, so clarified as of
-***************
-*** 417,422 ****
---- 417,427 ----
-  http://us.imdb.com/title/tt0137494/
-  . (Mark Brader, 2009-10-02)
-  
-+ 
  • 
-+ In "The Todd Couple" episode of "Outsourced" (first aired 2011-02-10),
-+ Manmeet sets up teledates for 6:00 and 9:00;
-+ since one is with a New Yorker and the other with a San Franciscan,
-+ hilarity ensues.
-  
    • 
-  
-  
    
-diff -r -c tzdata2011b/zone.tab tzdata2011b/zone.tab
-*** tzdata2011b/zone.tab	Wed Jan 26 18:47:09 2011
---- tzdata2011b/zone.tab	Wed Feb  9 14:00:33 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)zone.tab	8.40
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
---- 1,5 ----
-  # 
    -! # @(#)zone.tab	8.41
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
-***************
-*** 412,420 ****
---- 412,422 ----
-  US	+340308-1181434	America/Los_Angeles	Pacific Time
-  US	+611305-1495401	America/Anchorage	Alaska Time
-  US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
-+ US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
-  US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
-  US	+643004-1652423	America/Nome	Alaska Time - west Alaska
-  US	+515248-1763929	America/Adak	Aleutian Islands
-+ US	+550737-1313435	America/Metlakatla	Metlakatla Time - Annette Island
-  US	+211825-1575130	Pacific/Honolulu	Hawaii
-  UY	-3453-05611	America/Montevideo
-  UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
-
diff --git a/tzdata-2011b-kemerovo.patch b/tzdata-2011d-kemerovo.patch
similarity index 79%
rename from tzdata-2011b-kemerovo.patch
rename to tzdata-2011d-kemerovo.patch
index 2310c6e..7c4fecd 100644
--- a/tzdata-2011b-kemerovo.patch
+++ b/tzdata-2011d-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011b/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011b/europe	2011-03-04 00:11:25.000000000 +0100
+--- tzdata2011d/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011d/europe	2011-03-04 00:11:25.000000000 +0100
 @@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index 4478068..ee78422 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011b
-%define tzdata_version 2011b
-%define tzcode_version 2011b
-Release: 3%{?dist}
+Version: 2011d
+%define tzdata_version 2011d
+%define tzcode_version 2011d
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,8 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011b-c.patch
-Patch2: tzdata-2011b-kemerovo.patch
+Patch1: tzdata-2011d-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +113,13 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Mar 15 2011 Petr Machata  - 2011d-1
+- Upstream 2011d:
+  - Change end of DST in Samoa in 2011.
+  - Change start of DST in Cuba in 2011.
+  - Move start of DST in Turkey by one day in 2011.
+- Dropped tzdata-2011b-c.patch
+
 * Fri Mar 04 2011 Petr Machata  - 2011b-3
 - Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)
 

From c45cecdd0c2e5095893500b009743d595c63dbb7 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 29 Mar 2011 13:36:28 +0200
Subject: [PATCH 130/280] Delay end of DST in Chile in 2011 until May 7

---
 tzdata-2011d-chile.patch | 19 +++++++++++++++++++
 tzdata.spec              |  9 +++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 tzdata-2011d-chile.patch

diff --git a/tzdata-2011d-chile.patch b/tzdata-2011d-chile.patch
new file mode 100644
index 0000000..6651d6f
--- /dev/null
+++ b/tzdata-2011d-chile.patch
@@ -0,0 +1,19 @@
+--- tzdata2011d/southamerica.old	2011-03-02 14:47:20.000000000 -0300
++++ tzdata2011d/southamerica	2011-03-28 10:47:24.000000000 -0300
+@@ -1201,5 +1201,5 @@
+ Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
+ Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
+-Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
++Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
+ # N.B.: the end of March 29 in Chile is March 30 in Universal time,
+@@ -1207,5 +1207,8 @@
+ Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+ Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+-Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
++Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
++Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
++Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
++Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
+ # IATA SSIM anomalies: (1992-02) says 1992-03-14;
diff --git a/tzdata.spec b/tzdata.spec
index ea8d4dd..b0a8e7b 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011d
 %define tzdata_version 2011d
 %define tzcode_version 2011d
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,7 +17,8 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011d-kemerovo.patch
+Patch1: tzdata-2011d-chile.patch
+Patch2: tzdata-2011d-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Mar 29 2011 Petr Machata  - 2011d-2
+- Delay end of DST in Chile in 2011 until May 7. (tzdata-2011d-chile.patch)
+
 * Tue Mar 15 2011 Petr Machata  - 2011d-1
 - Upstream 2011d:
   - Change end of DST in Samoa in 2011.

From 44daa8c2f02a5fa3e38b45d6b3305e173e3786f6 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 29 Mar 2011 16:40:13 +0200
Subject: [PATCH 131/280] Delay end of DST in Chile in 2011 until May 7

---
 tzdata-2011d-chile.patch | 19 +++++++++++++++++++
 tzdata.spec              |  9 +++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 tzdata-2011d-chile.patch

diff --git a/tzdata-2011d-chile.patch b/tzdata-2011d-chile.patch
new file mode 100644
index 0000000..6651d6f
--- /dev/null
+++ b/tzdata-2011d-chile.patch
@@ -0,0 +1,19 @@
+--- tzdata2011d/southamerica.old	2011-03-02 14:47:20.000000000 -0300
++++ tzdata2011d/southamerica	2011-03-28 10:47:24.000000000 -0300
+@@ -1201,5 +1201,5 @@
+ Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
+ Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
+-Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
++Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
+ # N.B.: the end of March 29 in Chile is March 30 in Universal time,
+@@ -1207,5 +1207,8 @@
+ Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+ Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+-Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
++Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
++Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
++Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
++Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
+ # IATA SSIM anomalies: (1992-02) says 1992-03-14;
diff --git a/tzdata.spec b/tzdata.spec
index ea8d4dd..b0a8e7b 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011d
 %define tzdata_version 2011d
 %define tzcode_version 2011d
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,7 +17,8 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011d-kemerovo.patch
+Patch1: tzdata-2011d-chile.patch
+Patch2: tzdata-2011d-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Mar 29 2011 Petr Machata  - 2011d-2
+- Delay end of DST in Chile in 2011 until May 7. (tzdata-2011d-chile.patch)
+
 * Tue Mar 15 2011 Petr Machata  - 2011d-1
 - Upstream 2011d:
   - Change end of DST in Samoa in 2011.

From d415976b888074fecbd834d43fc4a4f91dd0a635 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 29 Mar 2011 16:41:16 +0200
Subject: [PATCH 132/280] Delay end of DST in Chile in 2011 until May 7

---
 tzdata-2011d-chile.patch | 19 +++++++++++++++++++
 tzdata.spec              |  9 +++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 tzdata-2011d-chile.patch

diff --git a/tzdata-2011d-chile.patch b/tzdata-2011d-chile.patch
new file mode 100644
index 0000000..6651d6f
--- /dev/null
+++ b/tzdata-2011d-chile.patch
@@ -0,0 +1,19 @@
+--- tzdata2011d/southamerica.old	2011-03-02 14:47:20.000000000 -0300
++++ tzdata2011d/southamerica	2011-03-28 10:47:24.000000000 -0300
+@@ -1201,5 +1201,5 @@
+ Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
+ Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
+-Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
++Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
+ # N.B.: the end of March 29 in Chile is March 30 in Universal time,
+@@ -1207,5 +1207,8 @@
+ Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+ Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+-Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
++Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
++Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
++Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
++Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
+ # IATA SSIM anomalies: (1992-02) says 1992-03-14;
diff --git a/tzdata.spec b/tzdata.spec
index ee78422..3fca4a9 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011d
 %define tzdata_version 2011d
 %define tzcode_version 2011d
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,7 +17,8 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011d-kemerovo.patch
+Patch1: tzdata-2011d-chile.patch
+Patch2: tzdata-2011d-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Mar 29 2011 Petr Machata  - 2011d-2
+- Delay end of DST in Chile in 2011 until May 7. (tzdata-2011d-chile.patch)
+
 * Tue Mar 15 2011 Petr Machata  - 2011d-1
 - Upstream 2011d:
   - Change end of DST in Samoa in 2011.

From e7a5415a41d0c7159e7ddd6420c3f07bd4f62c8e Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 30 Mar 2011 17:57:55 +0200
Subject: [PATCH 133/280] Morocco introduced DST for 2011 from April 2 to July
 31

---
 tzdata-2011d-morocco.patch | 15 +++++++++++++++
 tzdata.spec                |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011d-morocco.patch

diff --git a/tzdata-2011d-morocco.patch b/tzdata-2011d-morocco.patch
new file mode 100644
index 0000000..a619608
--- /dev/null
+++ b/tzdata-2011d-morocco.patch
@@ -0,0 +1,15 @@
+diff -up tzdata2011d/africa\~ tzdata2011d/africa
+--- tzdata2011d/africa~	2010-12-16 18:24:19.000000000 +0100
++++ tzdata2011d/africa	2011-03-30 17:02:26.000000000 +0200
+@@ -735,6 +735,9 @@ Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:
+ Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
+ Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+ Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
++Rule	Morocco 2011	only	-	Apr	 3	 0:00	1:00	S
++Rule	Morocco 2011	only	-	Aug	 1	 0:00	0	-
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
+ 			 0:00	Morocco	WE%sT	1984 Mar 16
+
+Diff finished.  Wed Mar 30 17:02:32 2011
diff --git a/tzdata.spec b/tzdata.spec
index b0a8e7b..f2ce2f0 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011d
 %define tzdata_version 2011d
 %define tzcode_version 2011d
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -19,6 +19,7 @@ Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011d-chile.patch
 Patch2: tzdata-2011d-kemerovo.patch
+Patch3: tzdata-2011d-morocco.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +55,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 # __apply_patches
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +117,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Mar 30 2011 Petr Machata  - 2011d-3
+- Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch)
+
 * Tue Mar 29 2011 Petr Machata  - 2011d-2
 - Delay end of DST in Chile in 2011 until May 7. (tzdata-2011d-chile.patch)
 

From 6203ab6d8064bd02bafe4fa441cddfc5c0e87338 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 30 Mar 2011 17:58:17 +0200
Subject: [PATCH 134/280] Morocco introduced DST for 2011 from April 2 to July
 31

---
 tzdata-2011d-morocco.patch | 15 +++++++++++++++
 tzdata.spec                |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011d-morocco.patch

diff --git a/tzdata-2011d-morocco.patch b/tzdata-2011d-morocco.patch
new file mode 100644
index 0000000..a619608
--- /dev/null
+++ b/tzdata-2011d-morocco.patch
@@ -0,0 +1,15 @@
+diff -up tzdata2011d/africa\~ tzdata2011d/africa
+--- tzdata2011d/africa~	2010-12-16 18:24:19.000000000 +0100
++++ tzdata2011d/africa	2011-03-30 17:02:26.000000000 +0200
+@@ -735,6 +735,9 @@ Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:
+ Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
+ Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+ Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
++Rule	Morocco 2011	only	-	Apr	 3	 0:00	1:00	S
++Rule	Morocco 2011	only	-	Aug	 1	 0:00	0	-
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
+ 			 0:00	Morocco	WE%sT	1984 Mar 16
+
+Diff finished.  Wed Mar 30 17:02:32 2011
diff --git a/tzdata.spec b/tzdata.spec
index b0a8e7b..f2ce2f0 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011d
 %define tzdata_version 2011d
 %define tzcode_version 2011d
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -19,6 +19,7 @@ Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011d-chile.patch
 Patch2: tzdata-2011d-kemerovo.patch
+Patch3: tzdata-2011d-morocco.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +55,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 # __apply_patches
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +117,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Mar 30 2011 Petr Machata  - 2011d-3
+- Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch)
+
 * Tue Mar 29 2011 Petr Machata  - 2011d-2
 - Delay end of DST in Chile in 2011 until May 7. (tzdata-2011d-chile.patch)
 

From 6f82283cc9c3be8a07429416445d10c5873cf6c9 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 30 Mar 2011 17:58:36 +0200
Subject: [PATCH 135/280] Morocco introduced DST for 2011 from April 2 to July
 31

---
 tzdata-2011d-morocco.patch | 15 +++++++++++++++
 tzdata.spec                |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011d-morocco.patch

diff --git a/tzdata-2011d-morocco.patch b/tzdata-2011d-morocco.patch
new file mode 100644
index 0000000..a619608
--- /dev/null
+++ b/tzdata-2011d-morocco.patch
@@ -0,0 +1,15 @@
+diff -up tzdata2011d/africa\~ tzdata2011d/africa
+--- tzdata2011d/africa~	2010-12-16 18:24:19.000000000 +0100
++++ tzdata2011d/africa	2011-03-30 17:02:26.000000000 +0200
+@@ -735,6 +735,9 @@ Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:
+ Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
+ Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+ Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
++Rule	Morocco 2011	only	-	Apr	 3	 0:00	1:00	S
++Rule	Morocco 2011	only	-	Aug	 1	 0:00	0	-
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
+ 			 0:00	Morocco	WE%sT	1984 Mar 16
+
+Diff finished.  Wed Mar 30 17:02:32 2011
diff --git a/tzdata.spec b/tzdata.spec
index 3fca4a9..a0dad95 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011d
 %define tzdata_version 2011d
 %define tzcode_version 2011d
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -19,6 +19,7 @@ Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011d-chile.patch
 Patch2: tzdata-2011d-kemerovo.patch
+Patch3: tzdata-2011d-morocco.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +55,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 # __apply_patches
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +117,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Mar 30 2011 Petr Machata  - 2011d-3
+- Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch)
+
 * Tue Mar 29 2011 Petr Machata  - 2011d-2
 - Delay end of DST in Chile in 2011 until May 7. (tzdata-2011d-chile.patch)
 

From 1520870880e3191369e69f3d5da4421da668a316 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 20 Apr 2011 13:08:49 +0200
Subject: [PATCH 136/280] Update to 2011f

- Upstream 2011e:
  - Canonical version of Chile and Morocco changes
- Upstream 2011f:
  - The Falkland Islands will not turn back clocks this winter, but
    stay on daylight saving time
- Resolves: #696587
---
 .gitignore                                    |  1 +
 sources                                       |  2 +-
 tzdata-2011d-chile.patch                      | 19 ----------------
 tzdata-2011d-morocco.patch                    | 15 -------------
 ...erovo.patch => tzdata-2011f-kemerovo.patch |  4 ++--
 tzdata.spec                                   | 22 +++++++++++--------
 6 files changed, 17 insertions(+), 46 deletions(-)
 delete mode 100644 tzdata-2011d-chile.patch
 delete mode 100644 tzdata-2011d-morocco.patch
 rename tzdata-2011d-kemerovo.patch => tzdata-2011f-kemerovo.patch (79%)

diff --git a/.gitignore b/.gitignore
index 43b23e1..7d33bd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@ tzdata/
 *.rpm
 /tzdata2011d.tar.gz
 /tzcode2011d.tar.gz
+/tzdata2011f.tar.gz
diff --git a/sources b/sources
index 4e8ee12..2b3688a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-03c5793502b7c41985edd73146bf7e36  tzdata2011d.tar.gz
 95095242ee368e6a7e107f154590ac11  tzcode2011d.tar.gz
+cc8136284ae1e6c720a18e0f080242e0  tzdata2011f.tar.gz
diff --git a/tzdata-2011d-chile.patch b/tzdata-2011d-chile.patch
deleted file mode 100644
index 6651d6f..0000000
--- a/tzdata-2011d-chile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- tzdata2011d/southamerica.old	2011-03-02 14:47:20.000000000 -0300
-+++ tzdata2011d/southamerica	2011-03-28 10:47:24.000000000 -0300
-@@ -1201,5 +1201,5 @@
- Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
- Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
--Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
-+Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
- Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
- # N.B.: the end of March 29 in Chile is March 30 in Universal time,
-@@ -1207,5 +1207,8 @@
- Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
- Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
--Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
-+Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
-+Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
-+Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-+Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
- Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
- # IATA SSIM anomalies: (1992-02) says 1992-03-14;
diff --git a/tzdata-2011d-morocco.patch b/tzdata-2011d-morocco.patch
deleted file mode 100644
index a619608..0000000
--- a/tzdata-2011d-morocco.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up tzdata2011d/africa\~ tzdata2011d/africa
---- tzdata2011d/africa~	2010-12-16 18:24:19.000000000 +0100
-+++ tzdata2011d/africa	2011-03-30 17:02:26.000000000 +0200
-@@ -735,6 +735,9 @@ Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:
- Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
- Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
- Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
-+Rule	Morocco 2011	only	-	Apr	 3	 0:00	1:00	S
-+Rule	Morocco 2011	only	-	Aug	 1	 0:00	0	-
-+
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
- 			 0:00	Morocco	WE%sT	1984 Mar 16
-
-Diff finished.  Wed Mar 30 17:02:32 2011
diff --git a/tzdata-2011d-kemerovo.patch b/tzdata-2011f-kemerovo.patch
similarity index 79%
rename from tzdata-2011d-kemerovo.patch
rename to tzdata-2011f-kemerovo.patch
index 7c4fecd..0abe4b8 100644
--- a/tzdata-2011d-kemerovo.patch
+++ b/tzdata-2011f-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011d/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011d/europe	2011-03-04 00:11:25.000000000 +0100
+--- tzdata2011f/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011f/europe	2011-03-04 00:11:25.000000000 +0100
 @@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index f2ce2f0..8c02056 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011d
-%define tzdata_version 2011d
-%define tzcode_version 2011d
-Release: 3%{?dist}
+Version: 2011f
+%define tzdata_version 2011f
+%define tzcode_version 2011e
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,9 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011d-chile.patch
-Patch2: tzdata-2011d-kemerovo.patch
-Patch3: tzdata-2011d-morocco.patch
+Patch1: tzdata-2011f-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,8 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
-%patch3 -p0
 # __end
 
 mkdir javazic
@@ -117,6 +113,14 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Apr 20 2011 Petr Machata  - 2011f-1
+- Upstream 2011e:
+  - Canonical version of Chile and Morocco changes
+- Upstream 2011f:
+  - The Falkland Islands will not turn back clocks this winter, but
+    stay on daylight saving time
+- Resolves: #696587
+
 * Wed Mar 30 2011 Petr Machata  - 2011d-3
 - Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch)
 

From 00358245b284a9addf23fd28e18dd50d97876737 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 20 Apr 2011 13:20:47 +0200
Subject: [PATCH 137/280] Commit tzcode2011e

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7d33bd2..611a385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@ tzdata/
 /tzdata2011d.tar.gz
 /tzcode2011d.tar.gz
 /tzdata2011f.tar.gz
+/tzcode2011e.tar.gz
diff --git a/sources b/sources
index 2b3688a..ff93047 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-95095242ee368e6a7e107f154590ac11  tzcode2011d.tar.gz
 cc8136284ae1e6c720a18e0f080242e0  tzdata2011f.tar.gz
+fbfc05dbf9ebcfe7c4bba18549870173  tzcode2011e.tar.gz

From 3c1d1802e6a742d0e5a1d851a3979d11c7da2975 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 26 Apr 2011 15:25:46 +0200
Subject: [PATCH 138/280] - Upstream 2011g:   - Egypt abandons DST in 2011 (and
 forward)

---
 .gitignore                                           |  4 ++++
 sources                                              |  4 ++--
 ...11f-kemerovo.patch => tzdata-2011g-kemerovo.patch |  6 +++---
 tzdata.spec                                          | 12 ++++++++----
 4 files changed, 17 insertions(+), 9 deletions(-)
 rename tzdata-2011f-kemerovo.patch => tzdata-2011g-kemerovo.patch (71%)

diff --git a/.gitignore b/.gitignore
index 611a385..1ef6dc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,7 @@ tzdata/
 /tzcode2011d.tar.gz
 /tzdata2011f.tar.gz
 /tzcode2011e.tar.gz
+/tzdata2011g.tar.gz
+/tzcode2011g.tar.gz
+noarch/
+.build-*
diff --git a/sources b/sources
index ff93047..b44920f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-cc8136284ae1e6c720a18e0f080242e0  tzdata2011f.tar.gz
-fbfc05dbf9ebcfe7c4bba18549870173  tzcode2011e.tar.gz
+a068c27e7e426fdb12ab0c88506df20d  tzdata2011g.tar.gz
+ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
diff --git a/tzdata-2011f-kemerovo.patch b/tzdata-2011g-kemerovo.patch
similarity index 71%
rename from tzdata-2011f-kemerovo.patch
rename to tzdata-2011g-kemerovo.patch
index 0abe4b8..a590c4f 100644
--- a/tzdata-2011f-kemerovo.patch
+++ b/tzdata-2011g-kemerovo.patch
@@ -1,6 +1,6 @@
-diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011f/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011f/europe	2011-03-04 00:11:25.000000000 +0100
+diff -up tzdata2011g/europe\~ tzdata2011g/europe
+--- tzdata2011g/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011g/europe	2011-03-04 00:11:25.000000000 +0100
 @@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index 8c02056..3f13e07 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011f
-%define tzdata_version 2011f
-%define tzcode_version 2011e
+Version: 2011g
+%define tzdata_version 2011g
+%define tzcode_version 2011g
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -17,7 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011f-kemerovo.patch
+Patch1: tzdata-2011g-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,6 +113,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Apr 26 2011 Petr Machata  - 2011g-1
+- Upstream 2011g:
+  - Egypt abandons DST in 2011 (and forward)
+
 * Wed Apr 20 2011 Petr Machata  - 2011f-1
 - Upstream 2011e:
   - Canonical version of Chile and Morocco changes

From 3793ae4790f7efbe54c16a5f9f42c5aa5707c440 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 26 Apr 2011 15:29:01 +0200
Subject: [PATCH 139/280] Rebase to 2011g

- Upstream 2011e:
  - Morocco introduced DST for 2011 from April 2 to July 31.
  - Delay end of DST in Chile in 2011 until May 7.
- Upstream 2011f:
  - The Falkland Islands will not turn back clocks this winter, but
    stay on daylight saving time.
- Upstream 2011g:
  - Egypt abandons DST in 2011 (and forward)
- Dropped tzdata-2011d-chile.patch
- Dropped tzdata-2011d-morocco.patch
---
 sources                                       |  4 +--
 tzdata-2011d-chile.patch                      | 19 --------------
 tzdata-2011d-morocco.patch                    | 15 -----------
 ...erovo.patch => tzdata-2011g-kemerovo.patch |  6 ++---
 tzdata.spec                                   | 26 ++++++++++++-------
 5 files changed, 22 insertions(+), 48 deletions(-)
 delete mode 100644 tzdata-2011d-chile.patch
 delete mode 100644 tzdata-2011d-morocco.patch
 rename tzdata-2011d-kemerovo.patch => tzdata-2011g-kemerovo.patch (71%)

diff --git a/sources b/sources
index 4e8ee12..ff93047 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-03c5793502b7c41985edd73146bf7e36  tzdata2011d.tar.gz
-95095242ee368e6a7e107f154590ac11  tzcode2011d.tar.gz
+cc8136284ae1e6c720a18e0f080242e0  tzdata2011f.tar.gz
+fbfc05dbf9ebcfe7c4bba18549870173  tzcode2011e.tar.gz
diff --git a/tzdata-2011d-chile.patch b/tzdata-2011d-chile.patch
deleted file mode 100644
index 6651d6f..0000000
--- a/tzdata-2011d-chile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- tzdata2011d/southamerica.old	2011-03-02 14:47:20.000000000 -0300
-+++ tzdata2011d/southamerica	2011-03-28 10:47:24.000000000 -0300
-@@ -1201,5 +1201,5 @@
- Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
- Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
--Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
-+Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
- Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
- # N.B.: the end of March 29 in Chile is March 30 in Universal time,
-@@ -1207,5 +1207,8 @@
- Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
- Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
--Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
-+Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
-+Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
-+Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-+Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
- Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
- # IATA SSIM anomalies: (1992-02) says 1992-03-14;
diff --git a/tzdata-2011d-morocco.patch b/tzdata-2011d-morocco.patch
deleted file mode 100644
index a619608..0000000
--- a/tzdata-2011d-morocco.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up tzdata2011d/africa\~ tzdata2011d/africa
---- tzdata2011d/africa~	2010-12-16 18:24:19.000000000 +0100
-+++ tzdata2011d/africa	2011-03-30 17:02:26.000000000 +0200
-@@ -735,6 +735,9 @@ Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:
- Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
- Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
- Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
-+Rule	Morocco 2011	only	-	Apr	 3	 0:00	1:00	S
-+Rule	Morocco 2011	only	-	Aug	 1	 0:00	0	-
-+
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
- 			 0:00	Morocco	WE%sT	1984 Mar 16
-
-Diff finished.  Wed Mar 30 17:02:32 2011
diff --git a/tzdata-2011d-kemerovo.patch b/tzdata-2011g-kemerovo.patch
similarity index 71%
rename from tzdata-2011d-kemerovo.patch
rename to tzdata-2011g-kemerovo.patch
index 7c4fecd..a590c4f 100644
--- a/tzdata-2011d-kemerovo.patch
+++ b/tzdata-2011g-kemerovo.patch
@@ -1,6 +1,6 @@
-diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011d/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011d/europe	2011-03-04 00:11:25.000000000 +0100
+diff -up tzdata2011g/europe\~ tzdata2011g/europe
+--- tzdata2011g/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011g/europe	2011-03-04 00:11:25.000000000 +0100
 @@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index f2ce2f0..23da033 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011d
-%define tzdata_version 2011d
-%define tzcode_version 2011d
-Release: 3%{?dist}
+Version: 2011g
+%define tzdata_version 2011g
+%define tzcode_version 2011g
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,9 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011d-chile.patch
-Patch2: tzdata-2011d-kemerovo.patch
-Patch3: tzdata-2011d-morocco.patch
+Patch1: tzdata-2011g-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,8 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
-%patch3 -p0
 # __end
 
 mkdir javazic
@@ -117,6 +113,18 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Apr 26 2011 Petr Machata  - 2011g-1
+- Upstream 2011e:
+  - Morocco introduced DST for 2011 from April 2 to July 31.
+  - Delay end of DST in Chile in 2011 until May 7.
+- Upstream 2011f:
+  - The Falkland Islands will not turn back clocks this winter, but
+    stay on daylight saving time.
+- Upstream 2011g:
+  - Egypt abandons DST in 2011 (and forward)
+- Dropped tzdata-2011d-chile.patch
+- Dropped tzdata-2011d-morocco.patch
+
 * Wed Mar 30 2011 Petr Machata  - 2011d-3
 - Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch)
 

From e41d55ac0865d14a3502f28242a4dd7c8709066c Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 26 Apr 2011 15:30:43 +0200
Subject: [PATCH 140/280] Update sources

---
 sources | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index ff93047..b44920f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-cc8136284ae1e6c720a18e0f080242e0  tzdata2011f.tar.gz
-fbfc05dbf9ebcfe7c4bba18549870173  tzcode2011e.tar.gz
+a068c27e7e426fdb12ab0c88506df20d  tzdata2011g.tar.gz
+ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz

From 2bd394b1041e03fa6bca4d897921b2bb7c70d485 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 26 Apr 2011 15:33:07 +0200
Subject: [PATCH 141/280] Rebase to 2011g

- Upstream 2011e:
  - Morocco introduced DST for 2011 from April 2 to July 31.
  - Delay end of DST in Chile in 2011 until May 7.
- Upstream 2011f:
  - The Falkland Islands will not turn back clocks this winter, but
    stay on daylight saving time.
- Upstream 2011g:
  - Egypt abandons DST in 2011 (and forward)
- Dropped tzdata-2011d-chile.patch
- Dropped tzdata-2011d-morocco.patch
---
 sources                                       |  4 +--
 tzdata-2011d-chile.patch                      | 19 --------------
 tzdata-2011d-morocco.patch                    | 15 -----------
 ...erovo.patch => tzdata-2011g-kemerovo.patch |  6 ++---
 tzdata.spec                                   | 26 ++++++++++++-------
 5 files changed, 22 insertions(+), 48 deletions(-)
 delete mode 100644 tzdata-2011d-chile.patch
 delete mode 100644 tzdata-2011d-morocco.patch
 rename tzdata-2011d-kemerovo.patch => tzdata-2011g-kemerovo.patch (71%)

diff --git a/sources b/sources
index 4e8ee12..b44920f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-03c5793502b7c41985edd73146bf7e36  tzdata2011d.tar.gz
-95095242ee368e6a7e107f154590ac11  tzcode2011d.tar.gz
+a068c27e7e426fdb12ab0c88506df20d  tzdata2011g.tar.gz
+ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
diff --git a/tzdata-2011d-chile.patch b/tzdata-2011d-chile.patch
deleted file mode 100644
index 6651d6f..0000000
--- a/tzdata-2011d-chile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- tzdata2011d/southamerica.old	2011-03-02 14:47:20.000000000 -0300
-+++ tzdata2011d/southamerica	2011-03-28 10:47:24.000000000 -0300
-@@ -1201,5 +1201,5 @@
- Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
- Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
--Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
-+Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
- Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
- # N.B.: the end of March 29 in Chile is March 30 in Universal time,
-@@ -1207,5 +1207,8 @@
- Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
- Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
--Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
-+Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
-+Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
-+Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-+Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
- Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
- # IATA SSIM anomalies: (1992-02) says 1992-03-14;
diff --git a/tzdata-2011d-morocco.patch b/tzdata-2011d-morocco.patch
deleted file mode 100644
index a619608..0000000
--- a/tzdata-2011d-morocco.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up tzdata2011d/africa\~ tzdata2011d/africa
---- tzdata2011d/africa~	2010-12-16 18:24:19.000000000 +0100
-+++ tzdata2011d/africa	2011-03-30 17:02:26.000000000 +0200
-@@ -735,6 +735,9 @@ Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:
- Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
- Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
- Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
-+Rule	Morocco 2011	only	-	Apr	 3	 0:00	1:00	S
-+Rule	Morocco 2011	only	-	Aug	 1	 0:00	0	-
-+
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
- 			 0:00	Morocco	WE%sT	1984 Mar 16
-
-Diff finished.  Wed Mar 30 17:02:32 2011
diff --git a/tzdata-2011d-kemerovo.patch b/tzdata-2011g-kemerovo.patch
similarity index 71%
rename from tzdata-2011d-kemerovo.patch
rename to tzdata-2011g-kemerovo.patch
index 7c4fecd..a590c4f 100644
--- a/tzdata-2011d-kemerovo.patch
+++ b/tzdata-2011g-kemerovo.patch
@@ -1,6 +1,6 @@
-diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011d/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011d/europe	2011-03-04 00:11:25.000000000 +0100
+diff -up tzdata2011g/europe\~ tzdata2011g/europe
+--- tzdata2011g/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011g/europe	2011-03-04 00:11:25.000000000 +0100
 @@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index a0dad95..83efe90 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011d
-%define tzdata_version 2011d
-%define tzcode_version 2011d
-Release: 3%{?dist}
+Version: 2011g
+%define tzdata_version 2011g
+%define tzcode_version 2011g
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,9 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011d-chile.patch
-Patch2: tzdata-2011d-kemerovo.patch
-Patch3: tzdata-2011d-morocco.patch
+Patch1: tzdata-2011g-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,8 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
-%patch3 -p0
 # __end
 
 mkdir javazic
@@ -117,6 +113,18 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Apr 26 2011 Petr Machata  - 2011g-1
+- Upstream 2011e:
+  - Morocco introduced DST for 2011 from April 2 to July 31.
+  - Delay end of DST in Chile in 2011 until May 7.
+- Upstream 2011f:
+  - The Falkland Islands will not turn back clocks this winter, but
+    stay on daylight saving time.
+- Upstream 2011g:
+  - Egypt abandons DST in 2011 (and forward)
+- Dropped tzdata-2011d-chile.patch
+- Dropped tzdata-2011d-morocco.patch
+
 * Wed Mar 30 2011 Petr Machata  - 2011d-3
 - Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch)
 

From 87f47eac61d9bb48619d85962f1b4f614ab83547 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 27 Jun 2011 16:44:04 +0200
Subject: [PATCH 142/280] Upstream 2011h:   - Russia abandons DST in 2011.   -
 *.tab: change AN (Netherlands Antilles) to CW (Curacao)

---
 .gitignore  | 1 +
 sources     | 2 +-
 tzdata.spec | 9 +++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ef6dc7..40cf432 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ tzdata/
 /tzcode2011g.tar.gz
 noarch/
 .build-*
+/tzdata2011h.tar.gz
diff --git a/sources b/sources
index b44920f..4d14f09 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-a068c27e7e426fdb12ab0c88506df20d  tzdata2011g.tar.gz
 ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
+546d27b6c1e5e1097bd512651815017f  tzdata2011h.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 3f13e07..f05dd88 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011g
+Version: 2011h
 %define tzdata_version 2011g
-%define tzcode_version 2011g
+%define tzcode_version 2011h
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -113,6 +113,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Jun 27 2011 Petr Machata  - 2011h-1
+- Upstream 2011h:
+  - Russia abandons DST in 2011.
+  - *.tab: change AN (Netherlands Antilles) to CW (Curacao)
+
 * Tue Apr 26 2011 Petr Machata  - 2011g-1
 - Upstream 2011g:
   - Egypt abandons DST in 2011 (and forward)

From c8135b0084216e89054ced0834ae9e998742c4c1 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 27 Jun 2011 16:51:21 +0200
Subject: [PATCH 143/280] Fix typo and rebase the kemerovo patch

---
 tzdata-2011g-kemerovo.patch | 14 --------------
 tzdata-2011h-kemerovo.patch | 16 ++++++++++++++++
 tzdata.spec                 |  6 +++---
 3 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 tzdata-2011g-kemerovo.patch
 create mode 100644 tzdata-2011h-kemerovo.patch

diff --git a/tzdata-2011g-kemerovo.patch b/tzdata-2011g-kemerovo.patch
deleted file mode 100644
index a590c4f..0000000
--- a/tzdata-2011g-kemerovo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up tzdata2011g/europe\~ tzdata2011g/europe
---- tzdata2011g/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011g/europe	2011-03-04 00:11:25.000000000 +0100
-@@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
- 			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
- 			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
- 			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
--			 6:00	Russia	NOV%sT # Novosibirsk/Novokuznetsk Time
-+			 6:00	Russia	OMS%sT # Novosibirsk/Novokuznetsk Time
- 
- #
- # From Oscar van Vlijmen (2001-08-25): [This region consists of]
-
-Diff finished.  Fri Mar  4 00:11:35 2011
diff --git a/tzdata-2011h-kemerovo.patch b/tzdata-2011h-kemerovo.patch
new file mode 100644
index 0000000..ff6da57
--- /dev/null
+++ b/tzdata-2011h-kemerovo.patch
@@ -0,0 +1,16 @@
+diff -up tzdata2011h/europe\~ tzdata2011h/europe
+--- tzdata2011h/europe~	2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011h/europe	2011-06-27 16:49:39.323493224 +0200
+@@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
+ 			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
+ 			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
+ 			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
+-			 6:00	Russia	NOV%sT	2011 Mar 27 2:00s
+-			 7:00	-	NOVT # Novosibirsk/Novokuznetsk Time
++			 6:00	Russia	OMS%sT	2011 Mar 27 2:00s
++			 7:00	-	OMST # Novosibirsk/Novokuznetsk Time
+ 
+ #
+ # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+
+Diff finished.  Mon Jun 27 16:49:45 2011
diff --git a/tzdata.spec b/tzdata.spec
index f05dd88..f386913 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2011h
-%define tzdata_version 2011g
-%define tzcode_version 2011h
+%define tzdata_version 2011h
+%define tzcode_version 2011g
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -17,7 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011g-kemerovo.patch
+Patch1: tzdata-2011h-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

From e9c65d9121c218a3a48a80856d16e7ce39a628f0 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 10 Aug 2011 22:46:34 +0200
Subject: [PATCH 144/280] Patch for upcoming change in Newfoundland

---
 tzdata-2011h-labrador.patch | 22 ++++++++++++++++++++++
 tzdata.spec                 |  8 +++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011h-labrador.patch

diff --git a/tzdata-2011h-labrador.patch b/tzdata-2011h-labrador.patch
new file mode 100644
index 0000000..f6c6aad
--- /dev/null
+++ b/tzdata-2011h-labrador.patch
@@ -0,0 +1,22 @@
+--- tzdata2011h/northamerica~	2011-06-15 11:05:20.000000000 +0000
++++ tzdata2011h/northamerica	2011-08-05 20:04:17.000000000 +0000
+@@ -1178,7 +1178,8 @@
+ 			-3:30:52 StJohns N%sT	1935 Mar 30
+ 			-3:30	StJohns	N%sT	1942 May 11
+ 			-3:30	Canada	N%sT	1946
+-			-3:30	StJohns	N%sT
++			-3:30	StJohns	N%sT	2011 Nov  6
++			-3:30	Canada	N%sT
+ 
+ # most of east Labrador
+ 
+@@ -1192,7 +1193,8 @@
+ 			-3:30	StJohns	N%sT	1942 May 11
+ 			-3:30	Canada	N%sT	1946
+ 			-3:30	StJohns	N%sT	1966 Mar 15 2:00
+-			-4:00	StJohns	A%sT
++			-4:00	StJohns	A%sT	2011 Nov  6
++			-4:00	Canada	A%sT
+ 
+ 
+ # west Labrador, Nova Scotia, Prince Edward I
diff --git a/tzdata.spec b/tzdata.spec
index 7c9c66a..cea04fe 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011h
 %define tzdata_version 2011h
 %define tzcode_version 2011g
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -18,6 +18,7 @@ Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011h-kemerovo.patch
+Patch2: tzdata-2011h-labrador.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Aug 10 2011 Petr Machata  - 2011h-2
+- Patch for upcoming change in Newfoundland.  The transition time
+  changes from 12:01 AM to 2:00 AM.
+
 * Mon Jun 27 2011 Petr Machata  - 2011h-1
 - Upstream 2011h:
   - Russia abandons DST in 2011.

From a67c3e7174e5c5be737f38dae8c7ce1e226694de Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 10 Aug 2011 22:51:40 +0200
Subject: [PATCH 145/280] Patch for upcoming change in Newfoundland

---
 tzdata-2011h-labrador.patch | 22 ++++++++++++++++++++++
 tzdata.spec                 |  8 +++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011h-labrador.patch

diff --git a/tzdata-2011h-labrador.patch b/tzdata-2011h-labrador.patch
new file mode 100644
index 0000000..f6c6aad
--- /dev/null
+++ b/tzdata-2011h-labrador.patch
@@ -0,0 +1,22 @@
+--- tzdata2011h/northamerica~	2011-06-15 11:05:20.000000000 +0000
++++ tzdata2011h/northamerica	2011-08-05 20:04:17.000000000 +0000
+@@ -1178,7 +1178,8 @@
+ 			-3:30:52 StJohns N%sT	1935 Mar 30
+ 			-3:30	StJohns	N%sT	1942 May 11
+ 			-3:30	Canada	N%sT	1946
+-			-3:30	StJohns	N%sT
++			-3:30	StJohns	N%sT	2011 Nov  6
++			-3:30	Canada	N%sT
+ 
+ # most of east Labrador
+ 
+@@ -1192,7 +1193,8 @@
+ 			-3:30	StJohns	N%sT	1942 May 11
+ 			-3:30	Canada	N%sT	1946
+ 			-3:30	StJohns	N%sT	1966 Mar 15 2:00
+-			-4:00	StJohns	A%sT
++			-4:00	StJohns	A%sT	2011 Nov  6
++			-4:00	Canada	A%sT
+ 
+ 
+ # west Labrador, Nova Scotia, Prince Edward I
diff --git a/tzdata.spec b/tzdata.spec
index 5a640ad..3d0b1e2 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011h
 %define tzdata_version 2011h
 %define tzcode_version 2011g
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -18,6 +18,7 @@ Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011h-kemerovo.patch
+Patch2: tzdata-2011h-labrador.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Aug 10 2011 Petr Machata  - 2011h-2
+- Patch for upcoming change in Newfoundland.  The transition time
+  changes from 12:01 AM to 2:00 AM.
+
 * Mon Jun 27 2011 Petr Machata  - 2011h-1
 - Upstream 2011h:
   - Russia abandons DST in 2011.

From ab6fc444132c0daabdb3f2b1cd61c9f953083bd0 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 10 Aug 2011 22:53:24 +0200
Subject: [PATCH 146/280] Patch for upcoming change in Newfoundland

---
 tzdata-2011h-labrador.patch | 22 ++++++++++++++++++++++
 tzdata.spec                 |  8 +++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011h-labrador.patch

diff --git a/tzdata-2011h-labrador.patch b/tzdata-2011h-labrador.patch
new file mode 100644
index 0000000..f6c6aad
--- /dev/null
+++ b/tzdata-2011h-labrador.patch
@@ -0,0 +1,22 @@
+--- tzdata2011h/northamerica~	2011-06-15 11:05:20.000000000 +0000
++++ tzdata2011h/northamerica	2011-08-05 20:04:17.000000000 +0000
+@@ -1178,7 +1178,8 @@
+ 			-3:30:52 StJohns N%sT	1935 Mar 30
+ 			-3:30	StJohns	N%sT	1942 May 11
+ 			-3:30	Canada	N%sT	1946
+-			-3:30	StJohns	N%sT
++			-3:30	StJohns	N%sT	2011 Nov  6
++			-3:30	Canada	N%sT
+ 
+ # most of east Labrador
+ 
+@@ -1192,7 +1193,8 @@
+ 			-3:30	StJohns	N%sT	1942 May 11
+ 			-3:30	Canada	N%sT	1946
+ 			-3:30	StJohns	N%sT	1966 Mar 15 2:00
+-			-4:00	StJohns	A%sT
++			-4:00	StJohns	A%sT	2011 Nov  6
++			-4:00	Canada	A%sT
+ 
+ 
+ # west Labrador, Nova Scotia, Prince Edward I
diff --git a/tzdata.spec b/tzdata.spec
index f386913..6b74641 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011h
 %define tzdata_version 2011h
 %define tzcode_version 2011g
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -18,6 +18,7 @@ Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011h-kemerovo.patch
+Patch2: tzdata-2011h-labrador.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Aug 10 2011 Petr Machata  - 2011h-2
+- Patch for upcoming change in Newfoundland.  The transition time
+  changes from 12:01 AM to 2:00 AM.
+
 * Mon Jun 27 2011 Petr Machata  - 2011h-1
 - Upstream 2011h:
   - Russia abandons DST in 2011.

From b4a26590d27ecb20baa0c1b95935bb6223417b46 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 10 Aug 2011 22:54:32 +0200
Subject: [PATCH 147/280] Patch for upcoming change in Newfoundland

---
 tzdata-2011h-labrador.patch | 22 ++++++++++++++++++++++
 tzdata.spec                 |  8 +++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011h-labrador.patch

diff --git a/tzdata-2011h-labrador.patch b/tzdata-2011h-labrador.patch
new file mode 100644
index 0000000..f6c6aad
--- /dev/null
+++ b/tzdata-2011h-labrador.patch
@@ -0,0 +1,22 @@
+--- tzdata2011h/northamerica~	2011-06-15 11:05:20.000000000 +0000
++++ tzdata2011h/northamerica	2011-08-05 20:04:17.000000000 +0000
+@@ -1178,7 +1178,8 @@
+ 			-3:30:52 StJohns N%sT	1935 Mar 30
+ 			-3:30	StJohns	N%sT	1942 May 11
+ 			-3:30	Canada	N%sT	1946
+-			-3:30	StJohns	N%sT
++			-3:30	StJohns	N%sT	2011 Nov  6
++			-3:30	Canada	N%sT
+ 
+ # most of east Labrador
+ 
+@@ -1192,7 +1193,8 @@
+ 			-3:30	StJohns	N%sT	1942 May 11
+ 			-3:30	Canada	N%sT	1946
+ 			-3:30	StJohns	N%sT	1966 Mar 15 2:00
+-			-4:00	StJohns	A%sT
++			-4:00	StJohns	A%sT	2011 Nov  6
++			-4:00	Canada	A%sT
+ 
+ 
+ # west Labrador, Nova Scotia, Prince Edward I
diff --git a/tzdata.spec b/tzdata.spec
index f386913..6b74641 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011h
 %define tzdata_version 2011h
 %define tzcode_version 2011g
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -18,6 +18,7 @@ Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011h-kemerovo.patch
+Patch2: tzdata-2011h-labrador.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Aug 10 2011 Petr Machata  - 2011h-2
+- Patch for upcoming change in Newfoundland.  The transition time
+  changes from 12:01 AM to 2:00 AM.
+
 * Mon Jun 27 2011 Petr Machata  - 2011h-1
 - Upstream 2011h:
   - Russia abandons DST in 2011.

From 7756f9e5a88116182c333ba4837b59e309ee3c38 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 30 Aug 2011 02:02:00 +0200
Subject: [PATCH 148/280] 2011i

new zones:
  Africa/Juba
     Introduced CAT (UTC+2, std) 31st (5th Wed) Dec 1930 21:53:36
     Introduced CAST (UTC+3, dst) 5th Thu Apr 22:00:00: 1970,1971
     Introduced CAST (UTC+3, dst) 29th Apr 22:00:00: 1972,1978
     Introduced CAST (UTC+3, dst) 4th Sat Apr 22:00:00: 1973-1977,1979-1985
     Introduced CAT (UTC+2, std) 14th Oct 21:00:00: 1970-1985
     Introduced EAT (UTC+3, std) 15th (3rd Sat) Jan 2000 10:00:00
     Introduced EAT-3: after last transition
changed zones:
  America/Metlakatla
     Dropped MeST (UTC-7, dst) 29th (5th Sun) Apr 1984 10:00:00
     Dropped MeST (UTC-7, dst) 4th Sun Apr 10:00:00: 1985,1986
     Dropped MeST (UTC-8, std) 4th Sun Oct 09:00:00: 1984-1987,1990,1992,1996,1998,2001,2003
     Dropped MeST (UTC-8, std) 5th Sun Oct 09:00:00: 1988,1989,1993,1995,1999,2000,2004,2006
     Dropped MeST (UTC-7, dst) 1st Sun Apr 10:00:00: 1987-2006
     Dropped MeST (UTC-8, std) 1st Sun Nov 09:00:00: 2007-2037
     Dropped MeST (UTC-7, dst) 2nd Sun Mar 10:00:00: 2007-2037
     Moved MeST8MeST,M3.2.0,M11.1.0 to MeST8: after last transition
  America/Resolute
     Introduced CDT (UTC-5, dst) 2nd Sun Mar 08:00:00: 2007-2037
     Introduced CST (UTC-6, std) 1st Sun Nov 07:00:00: 2007-2037
     Dropped CDT (UTC-5, std) 2nd Sun Mar 07:00:00: 2007-2407
     Dropped EST (UTC-5, std) 1st Sun Nov 07:00:00: 2007-2407
     Introduced CST6CDT,M3.2.0,M11.1.0: after last transition
  Europe/Kaliningrad
     Dropped EET (UTC+3, std) 27th Mar 2011 00:00:00
     Introduced KALT (UTC+3, std) 27th Mar 2011 00:00:00
     Moved EET-3 to KALT-3: after last transition
  Pacific/Apia
     Introduced WST (UTC+13, std) 30th Dec 2011 11:00:00
     Moved WST11 to WST-13: after last transition
---
 .gitignore                                    |  2 ++
 sources                                       |  4 ++--
 ...erovo.patch => tzdata-2011i-kemerovo.patch |  4 ++--
 tzdata.spec                                   | 21 +++++++++++++------
 4 files changed, 21 insertions(+), 10 deletions(-)
 rename tzdata-2011h-kemerovo.patch => tzdata-2011i-kemerovo.patch (81%)

diff --git a/.gitignore b/.gitignore
index 40cf432..e60390d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,5 @@ tzdata/
 noarch/
 .build-*
 /tzdata2011h.tar.gz
+/tzdata2011i.tar.gz
+/tzcode2011i.tar.gz
diff --git a/sources b/sources
index 4d14f09..b7418fb 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
-546d27b6c1e5e1097bd512651815017f  tzdata2011h.tar.gz
+c7a86ec34f30f8d6aa77ef94902a3047  tzdata2011i.tar.gz
+cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
diff --git a/tzdata-2011h-kemerovo.patch b/tzdata-2011i-kemerovo.patch
similarity index 81%
rename from tzdata-2011h-kemerovo.patch
rename to tzdata-2011i-kemerovo.patch
index ff6da57..ef52390 100644
--- a/tzdata-2011h-kemerovo.patch
+++ b/tzdata-2011i-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011h/europe\~ tzdata2011h/europe
---- tzdata2011h/europe~	2011-06-15 13:31:00.000000000 +0200
-+++ tzdata2011h/europe	2011-06-27 16:49:39.323493224 +0200
+--- tzdata2011i/europe~	2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011i/europe	2011-06-27 16:49:39.323493224 +0200
 @@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index cea04fe..22562d3 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2011h
-%define tzdata_version 2011h
-%define tzcode_version 2011g
-Release: 2%{?dist}
+%define tzdata_version 2011i
+%define tzcode_version 2011i
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,8 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011h-kemerovo.patch
-Patch2: tzdata-2011h-labrador.patch
+Patch1: tzdata-2011i-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +113,17 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Aug 29 2011 Petr Machata  - 2011h-1
+- Upstream 2011i:
+  - Add Africa/Juba (South Sudan) zone
+  - Samoa skips over the date line on 2011-12-30
+  - Use KALT as abbreviation for Europe/Kalinigrad
+  - Canonical version of the Newfoundland patch
+  - Change America/Resolute use of EST to 2006-2007 only
+  - Assume Metlakatla abandoned use of daylight saving in 1983
+  - Sync iso3166.tab and zone.tab with above
+- Resolved: #734063
+
 * Wed Aug 10 2011 Petr Machata  - 2011h-2
 - Patch for upcoming change in Newfoundland.  The transition time
   changes from 12:01 AM to 2:00 AM.

From 737fec97144350167104ba48fdf0c047b7195177 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 30 Aug 2011 02:02:00 +0200
Subject: [PATCH 149/280] 2011i

new zones:
  Africa/Juba
     Introduced CAT (UTC+2, std) 31st (5th Wed) Dec 1930 21:53:36
     Introduced CAST (UTC+3, dst) 5th Thu Apr 22:00:00: 1970,1971
     Introduced CAST (UTC+3, dst) 29th Apr 22:00:00: 1972,1978
     Introduced CAST (UTC+3, dst) 4th Sat Apr 22:00:00: 1973-1977,1979-1985
     Introduced CAT (UTC+2, std) 14th Oct 21:00:00: 1970-1985
     Introduced EAT (UTC+3, std) 15th (3rd Sat) Jan 2000 10:00:00
     Introduced EAT-3: after last transition
changed zones:
  America/Metlakatla
     Dropped MeST (UTC-7, dst) 29th (5th Sun) Apr 1984 10:00:00
     Dropped MeST (UTC-7, dst) 4th Sun Apr 10:00:00: 1985,1986
     Dropped MeST (UTC-8, std) 4th Sun Oct 09:00:00: 1984-1987,1990,1992,1996,1998,2001,2003
     Dropped MeST (UTC-8, std) 5th Sun Oct 09:00:00: 1988,1989,1993,1995,1999,2000,2004,2006
     Dropped MeST (UTC-7, dst) 1st Sun Apr 10:00:00: 1987-2006
     Dropped MeST (UTC-8, std) 1st Sun Nov 09:00:00: 2007-2037
     Dropped MeST (UTC-7, dst) 2nd Sun Mar 10:00:00: 2007-2037
     Moved MeST8MeST,M3.2.0,M11.1.0 to MeST8: after last transition
  America/Resolute
     Introduced CDT (UTC-5, dst) 2nd Sun Mar 08:00:00: 2007-2037
     Introduced CST (UTC-6, std) 1st Sun Nov 07:00:00: 2007-2037
     Dropped CDT (UTC-5, std) 2nd Sun Mar 07:00:00: 2007-2407
     Dropped EST (UTC-5, std) 1st Sun Nov 07:00:00: 2007-2407
     Introduced CST6CDT,M3.2.0,M11.1.0: after last transition
  Europe/Kaliningrad
     Dropped EET (UTC+3, std) 27th Mar 2011 00:00:00
     Introduced KALT (UTC+3, std) 27th Mar 2011 00:00:00
     Moved EET-3 to KALT-3: after last transition
  Pacific/Apia
     Introduced WST (UTC+13, std) 30th Dec 2011 11:00:00
     Moved WST11 to WST-13: after last transition
---
 .gitignore                                    |  2 ++
 sources                                       |  4 ++--
 ...erovo.patch => tzdata-2011i-kemerovo.patch |  4 ++--
 tzdata.spec                                   | 21 +++++++++++++------
 4 files changed, 21 insertions(+), 10 deletions(-)
 rename tzdata-2011h-kemerovo.patch => tzdata-2011i-kemerovo.patch (81%)

diff --git a/.gitignore b/.gitignore
index 40cf432..e60390d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,5 @@ tzdata/
 noarch/
 .build-*
 /tzdata2011h.tar.gz
+/tzdata2011i.tar.gz
+/tzcode2011i.tar.gz
diff --git a/sources b/sources
index 4d14f09..b7418fb 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
-546d27b6c1e5e1097bd512651815017f  tzdata2011h.tar.gz
+c7a86ec34f30f8d6aa77ef94902a3047  tzdata2011i.tar.gz
+cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
diff --git a/tzdata-2011h-kemerovo.patch b/tzdata-2011i-kemerovo.patch
similarity index 81%
rename from tzdata-2011h-kemerovo.patch
rename to tzdata-2011i-kemerovo.patch
index ff6da57..ef52390 100644
--- a/tzdata-2011h-kemerovo.patch
+++ b/tzdata-2011i-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011h/europe\~ tzdata2011h/europe
---- tzdata2011h/europe~	2011-06-15 13:31:00.000000000 +0200
-+++ tzdata2011h/europe	2011-06-27 16:49:39.323493224 +0200
+--- tzdata2011i/europe~	2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011i/europe	2011-06-27 16:49:39.323493224 +0200
 @@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index 3d0b1e2..8b55f39 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2011h
-%define tzdata_version 2011h
-%define tzcode_version 2011g
-Release: 2%{?dist}
+%define tzdata_version 2011i
+%define tzcode_version 2011i
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,8 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011h-kemerovo.patch
-Patch2: tzdata-2011h-labrador.patch
+Patch1: tzdata-2011i-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +113,17 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Aug 29 2011 Petr Machata  - 2011h-1
+- Upstream 2011i:
+  - Add Africa/Juba (South Sudan) zone
+  - Samoa skips over the date line on 2011-12-30
+  - Use KALT as abbreviation for Europe/Kalinigrad
+  - Canonical version of the Newfoundland patch
+  - Change America/Resolute use of EST to 2006-2007 only
+  - Assume Metlakatla abandoned use of daylight saving in 1983
+  - Sync iso3166.tab and zone.tab with above
+- Resolved: #734063
+
 * Wed Aug 10 2011 Petr Machata  - 2011h-2
 - Patch for upcoming change in Newfoundland.  The transition time
   changes from 12:01 AM to 2:00 AM.

From 4065de23999aab97eb5e06ec6cbe2737546216f9 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 30 Aug 2011 02:02:00 +0200
Subject: [PATCH 150/280] 2011i

new zones:
  Africa/Juba
     Introduced CAT (UTC+2, std) 31st (5th Wed) Dec 1930 21:53:36
     Introduced CAST (UTC+3, dst) 5th Thu Apr 22:00:00: 1970,1971
     Introduced CAST (UTC+3, dst) 29th Apr 22:00:00: 1972,1978
     Introduced CAST (UTC+3, dst) 4th Sat Apr 22:00:00: 1973-1977,1979-1985
     Introduced CAT (UTC+2, std) 14th Oct 21:00:00: 1970-1985
     Introduced EAT (UTC+3, std) 15th (3rd Sat) Jan 2000 10:00:00
     Introduced EAT-3: after last transition
changed zones:
  America/Metlakatla
     Dropped MeST (UTC-7, dst) 29th (5th Sun) Apr 1984 10:00:00
     Dropped MeST (UTC-7, dst) 4th Sun Apr 10:00:00: 1985,1986
     Dropped MeST (UTC-8, std) 4th Sun Oct 09:00:00: 1984-1987,1990,1992,1996,1998,2001,2003
     Dropped MeST (UTC-8, std) 5th Sun Oct 09:00:00: 1988,1989,1993,1995,1999,2000,2004,2006
     Dropped MeST (UTC-7, dst) 1st Sun Apr 10:00:00: 1987-2006
     Dropped MeST (UTC-8, std) 1st Sun Nov 09:00:00: 2007-2037
     Dropped MeST (UTC-7, dst) 2nd Sun Mar 10:00:00: 2007-2037
     Moved MeST8MeST,M3.2.0,M11.1.0 to MeST8: after last transition
  America/Resolute
     Introduced CDT (UTC-5, dst) 2nd Sun Mar 08:00:00: 2007-2037
     Introduced CST (UTC-6, std) 1st Sun Nov 07:00:00: 2007-2037
     Dropped CDT (UTC-5, std) 2nd Sun Mar 07:00:00: 2007-2407
     Dropped EST (UTC-5, std) 1st Sun Nov 07:00:00: 2007-2407
     Introduced CST6CDT,M3.2.0,M11.1.0: after last transition
  Europe/Kaliningrad
     Dropped EET (UTC+3, std) 27th Mar 2011 00:00:00
     Introduced KALT (UTC+3, std) 27th Mar 2011 00:00:00
     Moved EET-3 to KALT-3: after last transition
  Pacific/Apia
     Introduced WST (UTC+13, std) 30th Dec 2011 11:00:00
     Moved WST11 to WST-13: after last transition
---
 .gitignore                                    |  2 ++
 sources                                       |  4 ++--
 ...erovo.patch => tzdata-2011i-kemerovo.patch |  4 ++--
 tzdata.spec                                   | 21 +++++++++++++------
 4 files changed, 21 insertions(+), 10 deletions(-)
 rename tzdata-2011h-kemerovo.patch => tzdata-2011i-kemerovo.patch (81%)

diff --git a/.gitignore b/.gitignore
index 40cf432..e60390d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,5 @@ tzdata/
 noarch/
 .build-*
 /tzdata2011h.tar.gz
+/tzdata2011i.tar.gz
+/tzcode2011i.tar.gz
diff --git a/sources b/sources
index 4d14f09..b7418fb 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
-546d27b6c1e5e1097bd512651815017f  tzdata2011h.tar.gz
+c7a86ec34f30f8d6aa77ef94902a3047  tzdata2011i.tar.gz
+cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
diff --git a/tzdata-2011h-kemerovo.patch b/tzdata-2011i-kemerovo.patch
similarity index 81%
rename from tzdata-2011h-kemerovo.patch
rename to tzdata-2011i-kemerovo.patch
index ff6da57..ef52390 100644
--- a/tzdata-2011h-kemerovo.patch
+++ b/tzdata-2011i-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011h/europe\~ tzdata2011h/europe
---- tzdata2011h/europe~	2011-06-15 13:31:00.000000000 +0200
-+++ tzdata2011h/europe	2011-06-27 16:49:39.323493224 +0200
+--- tzdata2011i/europe~	2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011i/europe	2011-06-27 16:49:39.323493224 +0200
 @@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index 6b74641..386b44d 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2011h
-%define tzdata_version 2011h
-%define tzcode_version 2011g
-Release: 2%{?dist}
+%define tzdata_version 2011i
+%define tzcode_version 2011i
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,8 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011h-kemerovo.patch
-Patch2: tzdata-2011h-labrador.patch
+Patch1: tzdata-2011i-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +113,17 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Aug 29 2011 Petr Machata  - 2011h-1
+- Upstream 2011i:
+  - Add Africa/Juba (South Sudan) zone
+  - Samoa skips over the date line on 2011-12-30
+  - Use KALT as abbreviation for Europe/Kalinigrad
+  - Canonical version of the Newfoundland patch
+  - Change America/Resolute use of EST to 2006-2007 only
+  - Assume Metlakatla abandoned use of daylight saving in 1983
+  - Sync iso3166.tab and zone.tab with above
+- Resolved: #734063
+
 * Wed Aug 10 2011 Petr Machata  - 2011h-2
 - Patch for upcoming change in Newfoundland.  The transition time
   changes from 12:01 AM to 2:00 AM.

From 00c5b9949144bd6a4f13a63003ee0c7ecbb3d5f3 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 30 Aug 2011 02:02:00 +0200
Subject: [PATCH 151/280] 2011i

new zones:
  Africa/Juba
     Introduced CAT (UTC+2, std) 31st (5th Wed) Dec 1930 21:53:36
     Introduced CAST (UTC+3, dst) 5th Thu Apr 22:00:00: 1970,1971
     Introduced CAST (UTC+3, dst) 29th Apr 22:00:00: 1972,1978
     Introduced CAST (UTC+3, dst) 4th Sat Apr 22:00:00: 1973-1977,1979-1985
     Introduced CAT (UTC+2, std) 14th Oct 21:00:00: 1970-1985
     Introduced EAT (UTC+3, std) 15th (3rd Sat) Jan 2000 10:00:00
     Introduced EAT-3: after last transition
changed zones:
  America/Metlakatla
     Dropped MeST (UTC-7, dst) 29th (5th Sun) Apr 1984 10:00:00
     Dropped MeST (UTC-7, dst) 4th Sun Apr 10:00:00: 1985,1986
     Dropped MeST (UTC-8, std) 4th Sun Oct 09:00:00: 1984-1987,1990,1992,1996,1998,2001,2003
     Dropped MeST (UTC-8, std) 5th Sun Oct 09:00:00: 1988,1989,1993,1995,1999,2000,2004,2006
     Dropped MeST (UTC-7, dst) 1st Sun Apr 10:00:00: 1987-2006
     Dropped MeST (UTC-8, std) 1st Sun Nov 09:00:00: 2007-2037
     Dropped MeST (UTC-7, dst) 2nd Sun Mar 10:00:00: 2007-2037
     Moved MeST8MeST,M3.2.0,M11.1.0 to MeST8: after last transition
  America/Resolute
     Introduced CDT (UTC-5, dst) 2nd Sun Mar 08:00:00: 2007-2037
     Introduced CST (UTC-6, std) 1st Sun Nov 07:00:00: 2007-2037
     Dropped CDT (UTC-5, std) 2nd Sun Mar 07:00:00: 2007-2407
     Dropped EST (UTC-5, std) 1st Sun Nov 07:00:00: 2007-2407
     Introduced CST6CDT,M3.2.0,M11.1.0: after last transition
  Europe/Kaliningrad
     Dropped EET (UTC+3, std) 27th Mar 2011 00:00:00
     Introduced KALT (UTC+3, std) 27th Mar 2011 00:00:00
     Moved EET-3 to KALT-3: after last transition
  Pacific/Apia
     Introduced WST (UTC+13, std) 30th Dec 2011 11:00:00
     Moved WST11 to WST-13: after last transition
---
 .gitignore                                    |  2 ++
 sources                                       |  4 ++--
 ...erovo.patch => tzdata-2011i-kemerovo.patch |  4 ++--
 tzdata.spec                                   | 21 +++++++++++++------
 4 files changed, 21 insertions(+), 10 deletions(-)
 rename tzdata-2011h-kemerovo.patch => tzdata-2011i-kemerovo.patch (81%)

diff --git a/.gitignore b/.gitignore
index 40cf432..e60390d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,5 @@ tzdata/
 noarch/
 .build-*
 /tzdata2011h.tar.gz
+/tzdata2011i.tar.gz
+/tzcode2011i.tar.gz
diff --git a/sources b/sources
index 4d14f09..b7418fb 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
-546d27b6c1e5e1097bd512651815017f  tzdata2011h.tar.gz
+c7a86ec34f30f8d6aa77ef94902a3047  tzdata2011i.tar.gz
+cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
diff --git a/tzdata-2011h-kemerovo.patch b/tzdata-2011i-kemerovo.patch
similarity index 81%
rename from tzdata-2011h-kemerovo.patch
rename to tzdata-2011i-kemerovo.patch
index ff6da57..ef52390 100644
--- a/tzdata-2011h-kemerovo.patch
+++ b/tzdata-2011i-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011h/europe\~ tzdata2011h/europe
---- tzdata2011h/europe~	2011-06-15 13:31:00.000000000 +0200
-+++ tzdata2011h/europe	2011-06-27 16:49:39.323493224 +0200
+--- tzdata2011i/europe~	2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011i/europe	2011-06-27 16:49:39.323493224 +0200
 @@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index 6b74641..386b44d 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2011h
-%define tzdata_version 2011h
-%define tzcode_version 2011g
-Release: 2%{?dist}
+%define tzdata_version 2011i
+%define tzcode_version 2011i
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,8 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011h-kemerovo.patch
-Patch2: tzdata-2011h-labrador.patch
+Patch1: tzdata-2011i-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +113,17 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Aug 29 2011 Petr Machata  - 2011h-1
+- Upstream 2011i:
+  - Add Africa/Juba (South Sudan) zone
+  - Samoa skips over the date line on 2011-12-30
+  - Use KALT as abbreviation for Europe/Kalinigrad
+  - Canonical version of the Newfoundland patch
+  - Change America/Resolute use of EST to 2006-2007 only
+  - Assume Metlakatla abandoned use of daylight saving in 1983
+  - Sync iso3166.tab and zone.tab with above
+- Resolved: #734063
+
 * Wed Aug 10 2011 Petr Machata  - 2011h-2
 - Patch for upcoming change in Newfoundland.  The transition time
   changes from 12:01 AM to 2:00 AM.

From c059127ca83828a969494494573bf4b59d280966 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 30 Aug 2011 02:45:58 +0200
Subject: [PATCH 152/280] Drop patch, bump version

---
 tzdata-2011h-labrador.patch | 22 ----------------------
 tzdata.spec                 |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 tzdata-2011h-labrador.patch

diff --git a/tzdata-2011h-labrador.patch b/tzdata-2011h-labrador.patch
deleted file mode 100644
index f6c6aad..0000000
--- a/tzdata-2011h-labrador.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tzdata2011h/northamerica~	2011-06-15 11:05:20.000000000 +0000
-+++ tzdata2011h/northamerica	2011-08-05 20:04:17.000000000 +0000
-@@ -1178,7 +1178,8 @@
- 			-3:30:52 StJohns N%sT	1935 Mar 30
- 			-3:30	StJohns	N%sT	1942 May 11
- 			-3:30	Canada	N%sT	1946
--			-3:30	StJohns	N%sT
-+			-3:30	StJohns	N%sT	2011 Nov  6
-+			-3:30	Canada	N%sT
- 
- # most of east Labrador
- 
-@@ -1192,7 +1193,8 @@
- 			-3:30	StJohns	N%sT	1942 May 11
- 			-3:30	Canada	N%sT	1946
- 			-3:30	StJohns	N%sT	1966 Mar 15 2:00
--			-4:00	StJohns	A%sT
-+			-4:00	StJohns	A%sT	2011 Nov  6
-+			-4:00	Canada	A%sT
- 
- 
- # west Labrador, Nova Scotia, Prince Edward I
diff --git a/tzdata.spec b/tzdata.spec
index 22562d3..d0a515b 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,6 +1,6 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011h
+Version: 2011i
 %define tzdata_version 2011i
 %define tzcode_version 2011i
 Release: 1%{?dist}

From c7f5e9c6981e3b965c718969df7b6c9c24ee85b4 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 30 Aug 2011 02:45:58 +0200
Subject: [PATCH 153/280] Drop patch, bump version

---
 tzdata-2011h-labrador.patch | 22 ----------------------
 tzdata.spec                 |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 tzdata-2011h-labrador.patch

diff --git a/tzdata-2011h-labrador.patch b/tzdata-2011h-labrador.patch
deleted file mode 100644
index f6c6aad..0000000
--- a/tzdata-2011h-labrador.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tzdata2011h/northamerica~	2011-06-15 11:05:20.000000000 +0000
-+++ tzdata2011h/northamerica	2011-08-05 20:04:17.000000000 +0000
-@@ -1178,7 +1178,8 @@
- 			-3:30:52 StJohns N%sT	1935 Mar 30
- 			-3:30	StJohns	N%sT	1942 May 11
- 			-3:30	Canada	N%sT	1946
--			-3:30	StJohns	N%sT
-+			-3:30	StJohns	N%sT	2011 Nov  6
-+			-3:30	Canada	N%sT
- 
- # most of east Labrador
- 
-@@ -1192,7 +1193,8 @@
- 			-3:30	StJohns	N%sT	1942 May 11
- 			-3:30	Canada	N%sT	1946
- 			-3:30	StJohns	N%sT	1966 Mar 15 2:00
--			-4:00	StJohns	A%sT
-+			-4:00	StJohns	A%sT	2011 Nov  6
-+			-4:00	Canada	A%sT
- 
- 
- # west Labrador, Nova Scotia, Prince Edward I
diff --git a/tzdata.spec b/tzdata.spec
index 8b55f39..03352af 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,6 +1,6 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011h
+Version: 2011i
 %define tzdata_version 2011i
 %define tzcode_version 2011i
 Release: 1%{?dist}

From 84aa22579e4d29d322915115b6f061cb039728af Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 30 Aug 2011 02:45:58 +0200
Subject: [PATCH 154/280] Drop patch, bump version

---
 tzdata-2011h-labrador.patch | 22 ----------------------
 tzdata.spec                 |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 tzdata-2011h-labrador.patch

diff --git a/tzdata-2011h-labrador.patch b/tzdata-2011h-labrador.patch
deleted file mode 100644
index f6c6aad..0000000
--- a/tzdata-2011h-labrador.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tzdata2011h/northamerica~	2011-06-15 11:05:20.000000000 +0000
-+++ tzdata2011h/northamerica	2011-08-05 20:04:17.000000000 +0000
-@@ -1178,7 +1178,8 @@
- 			-3:30:52 StJohns N%sT	1935 Mar 30
- 			-3:30	StJohns	N%sT	1942 May 11
- 			-3:30	Canada	N%sT	1946
--			-3:30	StJohns	N%sT
-+			-3:30	StJohns	N%sT	2011 Nov  6
-+			-3:30	Canada	N%sT
- 
- # most of east Labrador
- 
-@@ -1192,7 +1193,8 @@
- 			-3:30	StJohns	N%sT	1942 May 11
- 			-3:30	Canada	N%sT	1946
- 			-3:30	StJohns	N%sT	1966 Mar 15 2:00
--			-4:00	StJohns	A%sT
-+			-4:00	StJohns	A%sT	2011 Nov  6
-+			-4:00	Canada	A%sT
- 
- 
- # west Labrador, Nova Scotia, Prince Edward I
diff --git a/tzdata.spec b/tzdata.spec
index 386b44d..85a1346 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,6 +1,6 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011h
+Version: 2011i
 %define tzdata_version 2011i
 %define tzcode_version 2011i
 Release: 1%{?dist}

From def154373d5ca578965aed2716f365811c10ccfd Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 30 Aug 2011 02:45:58 +0200
Subject: [PATCH 155/280] Drop patch, bump version

---
 tzdata-2011h-labrador.patch | 22 ----------------------
 tzdata.spec                 |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 tzdata-2011h-labrador.patch

diff --git a/tzdata-2011h-labrador.patch b/tzdata-2011h-labrador.patch
deleted file mode 100644
index f6c6aad..0000000
--- a/tzdata-2011h-labrador.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tzdata2011h/northamerica~	2011-06-15 11:05:20.000000000 +0000
-+++ tzdata2011h/northamerica	2011-08-05 20:04:17.000000000 +0000
-@@ -1178,7 +1178,8 @@
- 			-3:30:52 StJohns N%sT	1935 Mar 30
- 			-3:30	StJohns	N%sT	1942 May 11
- 			-3:30	Canada	N%sT	1946
--			-3:30	StJohns	N%sT
-+			-3:30	StJohns	N%sT	2011 Nov  6
-+			-3:30	Canada	N%sT
- 
- # most of east Labrador
- 
-@@ -1192,7 +1193,8 @@
- 			-3:30	StJohns	N%sT	1942 May 11
- 			-3:30	Canada	N%sT	1946
- 			-3:30	StJohns	N%sT	1966 Mar 15 2:00
--			-4:00	StJohns	A%sT
-+			-4:00	StJohns	A%sT	2011 Nov  6
-+			-4:00	Canada	A%sT
- 
- 
- # west Labrador, Nova Scotia, Prince Edward I
diff --git a/tzdata.spec b/tzdata.spec
index 386b44d..85a1346 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,6 +1,6 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011h
+Version: 2011i
 %define tzdata_version 2011i
 %define tzcode_version 2011i
 Release: 1%{?dist}

From 9d2390c572888a19e71fe6a7ef7d90e55a6a5070 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 21 Sep 2011 21:07:47 +0200
Subject: [PATCH 156/280] Upstream 2011j plus proposed patch for 2011k to track
 Belarus and Ukraine

---
 .gitignore                                    |   1 +
 sources                                       |   2 +-
 tzdata-2011j-k.patch                          | 451 ++++++++++++++++++
 ...erovo.patch => tzdata-2011j-kemerovo.patch |   4 +-
 tzdata.spec                                   |  21 +-
 5 files changed, 472 insertions(+), 7 deletions(-)
 create mode 100644 tzdata-2011j-k.patch
 rename tzdata-2011i-kemerovo.patch => tzdata-2011j-kemerovo.patch (81%)

diff --git a/.gitignore b/.gitignore
index e60390d..ff3ccb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@ noarch/
 /tzdata2011h.tar.gz
 /tzdata2011i.tar.gz
 /tzcode2011i.tar.gz
+/tzdata2011j.tar.gz
diff --git a/sources b/sources
index b7418fb..c38fd86 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-c7a86ec34f30f8d6aa77ef94902a3047  tzdata2011i.tar.gz
 cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
+30a6bebdbdd03c5bd29241c15f569d50  tzdata2011j.tar.gz
diff --git a/tzdata-2011j-k.patch b/tzdata-2011j-k.patch
new file mode 100644
index 0000000..c4341b2
--- /dev/null
+++ b/tzdata-2011j-k.patch
@@ -0,0 +1,451 @@
+diff -r -c old/asia new/asia
+*** tzdata2011j/asia	Sat Sep  3 08:28:37 2011
+--- tzdata2011k/asia	Tue Sep 20 17:54:03 2011
+***************
+*** 1,4 ****
+! # @(#)asia	8.65
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,4 ----
+! # @(#)asia	8.68
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 2194,2200 ****
+--- 2194,2230 ----
+  # http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
+  # 
+  
++ # From Steffen Thorsen (2011-08-26):
++ # Gaza and the West Bank did go back to standard time in the beginning of
++ # August, and will now enter daylight saving time again on 2011-08-30
++ # 00:00 (so two periods of DST in 2011). The pause was because of
++ # Ramadan.
++ #
++ # 
++ # http://www.maannews.net/eng/ViewDetails.aspx?ID=416217
++ # 
++ # Additional info:
++ # 
++ # http://www.timeanddate.com/news/time/palestine-dst-2011.html
++ # 
++ 
++ # From Alexander Krivenyshev (2011-08-27):
++ # According to the article in The Jerusalem Post:
++ # "...Earlier this month, the Palestinian government in the West Bank decided to
++ # move to standard time for 30 days, during Ramadan. The Palestinians in the
++ # Gaza Strip accepted the change and also moved their clocks one hour back.
++ # The Hamas government said on Saturday that it won't observe summertime after
++ # the Muslim feast of Id al-Fitr, which begins on Tuesday..."
++ # ...
++ # 
++ # http://www.jpost.com/MiddleEast/Article.aspx?id=235650
++ # 
++ # or
++ # 
++ # http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html
++ # 
+  # The rules for Egypt are stolen from the `africa' file.
++ 
+  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+  Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
+  Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
+***************
+*** 2210,2221 ****
+  Rule Palestine	2006	2008	-	Apr	 1	0:00	1:00	S
+  Rule Palestine	2006	only	-	Sep	22	0:00	0	-
+  Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
+! Rule Palestine	2008	only	-	Aug	lastFri	2:00	0	-
+  Rule Palestine	2009	only	-	Mar	lastFri	0:00	1:00	S
+! Rule Palestine	2010	max	-	Mar	lastSat	0:01	1:00	S
+! Rule Palestine	2009	max	-	Sep	Fri>=1	2:00	0	-
+  Rule Palestine	2010	only	-	Aug	11	0:00	0	-
+  
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+  Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
+  			2:00	Zion	EET	1948 May 15
+--- 2240,2254 ----
+  Rule Palestine	2006	2008	-	Apr	 1	0:00	1:00	S
+  Rule Palestine	2006	only	-	Sep	22	0:00	0	-
+  Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
+! Rule Palestine	2008	only	-	Aug	lastFri	0:00	0	-
+  Rule Palestine	2009	only	-	Mar	lastFri	0:00	1:00	S
+! Rule Palestine	2009	only	-	Sep	Fri>=1	2:00	0	-
+! Rule Palestine	2010	only	-	Mar	lastSat	0:01	1:00	S
+  Rule Palestine	2010	only	-	Aug	11	0:00	0	-
+  
++ # From Arthur David Olson (2011-09-20):
++ # 2011 transitions per http://www.timeanddate.com as of 2011-09-20.
++ 
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+  Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
+  			2:00	Zion	EET	1948 May 15
+***************
+*** 2222,2229 ****
+  			2:00 EgyptAsia	EE%sT	1967 Jun  5
+  			2:00	Zion	I%sT	1996
+  			2:00	Jordan	EE%sT	1999
+! 			2:00 Palestine	EE%sT
+  
+  # Paracel Is
+  # no information
+  
+--- 2255,2277 ----
+  			2:00 EgyptAsia	EE%sT	1967 Jun  5
+  			2:00	Zion	I%sT	1996
+  			2:00	Jordan	EE%sT	1999
+! 			2:00 Palestine	EE%sT	2011 Apr  2 12:01
+! 			2:00	1:00	EEST	2011 Aug  1
+! 			2:00	-	EET
+  
++ Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
++ 			2:00	Zion	EET	1948 May 15
++ 			2:00 EgyptAsia	EE%sT	1967 Jun  5
++ 			2:00	Zion	I%sT	1996
++ 			2:00	Jordan	EE%sT	1999
++ 			2:00 Palestine	EE%sT	2008 Aug
++ 			2:00 	1:00	EEST	2008 Sep
++ 			2:00 Palestine	EE%sT	2011 Apr  1 12:01
++ 			2:00	1:00	EEST	2011 Aug  1
++ 			2:00	-	EET	2011 Aug 30
++ 			2:00	1:00	EEST	2011 Oct  3 3:00
++ 			2:00	-	EET
++ 
+  # Paracel Is
+  # no information
+  
+diff -r -c old/europe new/europe
+*** tzdata2011j/europe	Wed Aug 17 12:52:01 2011
+--- tzdata2011k/europe	Tue Sep 20 17:44:59 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)europe	8.34
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
    +! # @(#)europe	8.38
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 561,569 ****
+  #
+  Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
+  Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
+! Rule	Russia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
+  Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
+! Rule	Russia	1996	max	-	Oct	lastSun	 2:00s	0	-
+  
+  # From Alexander Krivenyshev (2011-06-14):
+  # According to Kremlin press service, Russian President Dmitry Medvedev
+--- 561,569 ----
+  #
+  Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
+  Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
+! Rule	Russia	1993	2010	-	Mar	lastSun	 2:00s	1:00	S
+  Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
+! Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
+  
+  # From Alexander Krivenyshev (2011-06-14):
+  # According to Kremlin press service, Russian President Dmitry Medvedev
+***************
+*** 583,589 ****
+  # From Arthur David Olson (2011-06-15):
+  # Take "abolishing daylight saving time" to mean that time is now considered
+  # to be standard.
+- # At least for now, keep the "old" Russia rules for the benefit of Belarus.
+  
+  # These are for backward compatibility with older versions.
+  
+--- 583,588 ----
+***************
+*** 689,694 ****
+--- 688,710 ----
+  			1:00	EU	CE%sT
+  
+  # Belarus
++ # From Yauhen Kharuzhy (2011-09-16):
++ # By latest Belarus government act Europe/Minsk timezone was changed to
++ # GMT+3 without DST (was GMT+2 with DST).
++ #
++ # Sources (Russian language):
++ # 1.
++ # 
++ # http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
++ # 
++ # 2.
++ # 
++ # http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
++ # 
++ # 3.
++ # 
++ # http://news.tut.by/society/250578.html
++ # 
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+  Zone	Europe/Minsk	1:50:16 -	LMT	1880
+  			1:50	-	MMT	1924 May 2 # Minsk Mean Time
+***************
+*** 700,706 ****
+  			2:00	1:00	EEST	1991 Sep 29 2:00s
+  			2:00	-	EET	1992 Mar 29 0:00s
+  			2:00	1:00	EEST	1992 Sep 27 0:00s
+! 			2:00	Russia	EE%sT
+  
+  # Belgium
+  #
+--- 716,723 ----
+  			2:00	1:00	EEST	1991 Sep 29 2:00s
+  			2:00	-	EET	1992 Mar 29 0:00s
+  			2:00	1:00	EEST	1992 Sep 27 0:00s
+! 			2:00	Russia	EE%sT	2011 Mar 27 2:00s
+! 			3:00	-	FET # Further-eastern European Time
+  
+  # Belgium
+  #
+***************
+*** 2034,2040 ****
+  			 2:00	Poland	CE%sT	1946
+  			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
+  			 2:00	Russia	EE%sT	2011 Mar 27 2:00s
+! 			 3:00	-	KALT
+  #
+  # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+  # Respublika Adygeya, Arkhangel'skaya oblast',
+--- 2051,2057 ----
+  			 2:00	Poland	CE%sT	1946
+  			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
+  			 2:00	Russia	EE%sT	2011 Mar 27 2:00s
+! 			 3:00	-	FET # Further-eastern European Time
+  #
+  # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+  # Respublika Adygeya, Arkhangel'skaya oblast',
+***************
+*** 2189,2195 ****
+  # [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'.
+  
+  # From Oscar van Vlijmen (2009-11-29):
+! # ...some regions of RUssia were merged with others since 2005...
+  # Some names were changed, no big deal, except for one instance: a new name.
+  # YAK/YAKST: UTC+9 Zabajkal'skij kraj.
+  
+--- 2206,2212 ----
+  # [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'.
+  
+  # From Oscar van Vlijmen (2009-11-29):
+! # ...some regions of [Russia] were merged with others since 2005...
+  # Some names were changed, no big deal, except for one instance: a new name.
+  # YAK/YAKST: UTC+9 Zabajkal'skij kraj.
+  
+***************
+*** 2613,2618 ****
+--- 2630,2657 ----
+  # of March at 3am the time is changing to 4am and each last Sunday of
+  # October the time at 4am is changing to 3am"
+  
++ # From Alexander Krivenyshev (2011-09-20):
++ # On September 20, 2011 the deputies of the Verkhovna Rada agreed to
++ # abolish the transfer clock to winter time.
++ #
++ # Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
++ # approval from 266 deputies.
++ #
++ # Ukraine abolishes transter back to the winter time (in Russian)
++ # 
++ # http://news.mail.ru/politics/6861560/
++ # 
++ #
++ # The Ukrainians will no longer change the clock (in Russian)
++ # 
++ # http://www.segodnya.ua/news/14290482.html
++ # 
++ #
++ # Deputies cancelled the winter time (in Russian)
++ # 
++ # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
++ # 
++ 
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+  # Most of Ukraine since 1970 has been like Kiev.
+  # "Kyiv" is the transliteration of the Ukrainian name, but
+***************
+*** 2626,2632 ****
+  			3:00	-	MSK	1990 Jul  1 2:00
+  			2:00	-	EET	1992
+  			2:00	E-Eur	EE%sT	1995
+! 			2:00	EU	EE%sT
+  # Ruthenia used CET 1990/1991.
+  # "Uzhhorod" is the transliteration of the Ukrainian name, but
+  # "Uzhgorod" is more common in English.
+--- 2665,2672 ----
+  			3:00	-	MSK	1990 Jul  1 2:00
+  			2:00	-	EET	1992
+  			2:00	E-Eur	EE%sT	1995
+! 			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+! 			3:00	-	FET # Further-eastern European Time
+  # Ruthenia used CET 1990/1991.
+  # "Uzhhorod" is the transliteration of the Ukrainian name, but
+  # "Uzhgorod" is more common in English.
+***************
+*** 2640,2646 ****
+  			1:00	-	CET	1991 Mar 31 3:00
+  			2:00	-	EET	1992
+  			2:00	E-Eur	EE%sT	1995
+! 			2:00	EU	EE%sT
+  # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
+  # "Zaporizhia" is the transliteration of the Ukrainian name, but
+  # "Zaporozh'ye" is more common in English.  Use the common English
+--- 2680,2687 ----
+  			1:00	-	CET	1991 Mar 31 3:00
+  			2:00	-	EET	1992
+  			2:00	E-Eur	EE%sT	1995
+! 			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+! 			3:00	-	FET # Further-eastern European Time
+  # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
+  # "Zaporizhia" is the transliteration of the Ukrainian name, but
+  # "Zaporozh'ye" is more common in English.  Use the common English
+***************
+*** 2653,2659 ****
+  			1:00	C-Eur	CE%sT	1943 Oct 25
+  			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
+  			2:00	E-Eur	EE%sT	1995
+! 			2:00	EU	EE%sT
+  # Central Crimea used Moscow time 1994/1997.
+  Zone Europe/Simferopol	2:16:24 -	LMT	1880
+  			2:16	-	SMT	1924 May  2 # Simferopol Mean T
+--- 2694,2701 ----
+  			1:00	C-Eur	CE%sT	1943 Oct 25
+  			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
+  			2:00	E-Eur	EE%sT	1995
+! 			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+! 			3:00	-	FET # Further-eastern European Time
+  # Central Crimea used Moscow time 1994/1997.
+  Zone Europe/Simferopol	2:16:24 -	LMT	1880
+  			2:16	-	SMT	1924 May  2 # Simferopol Mean T
+***************
+*** 2678,2684 ****
+  # Assume it happened in March by not changing the clocks.
+  			3:00	Russia	MSK/MSD	1997
+  			3:00	-	MSK	1997 Mar lastSun 1:00u
+! 			2:00	EU	EE%sT
+  
+  ###############################################################################
+  
+--- 2720,2727 ----
+  # Assume it happened in March by not changing the clocks.
+  			3:00	Russia	MSK/MSD	1997
+  			3:00	-	MSK	1997 Mar lastSun 1:00u
+! 			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+! 			3:00	-	FET # Further-eastern European Time
+  
+  ###############################################################################
+  
+diff -r -c old/northamerica new/northamerica
+*** tzdata2011j/northamerica	Wed Aug 17 17:33:36 2011
+--- tzdata2011k/northamerica	Tue Sep 20 13:55:04 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)northamerica	8.48
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
    +! # @(#)northamerica	8.49
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 1168,1198 ****
+  # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
+  # at 00:01 local time.  For now, assume it started in 1987.
+  
+! # From Michael Pelley (2011-08-05):
+! # The Government of Newfoundland and Labrador has pending changes to
+! # modify the hour for daylight savings time to come into effect in
+! # November 2011. This modification would change the time from 12:01AM to
+! # 2:00AM on the dates of the switches of Daylight Savings Time to/from
+! # Standard Time.
+! #
+! # As a matter of reference, in Canada provinces have the authority of
+! # setting time zone information. The legislation has passed our
+! # legislative body (The House of Assembly) and is awaiting the
+! # proclamation to come into effect. You may find this information at:
+! # 
+! # http://www.assembly.nl.ca/legislation/sr/lists/Proclamation.htm
+  # 
+- # and
+- # search within that web page for Standard Time (Amendment) Act. The Act
+- # may be found at:
+- # 
+- # http://www.assembly.nl.ca/business/bills/Bill1106.htm
+- # 
+  # ...
+! # MICHAEL PELLEY | Manager of Enterprise Architecture - Solution Delivery
+! # Office of the Chief Information Officer Executive Council Government of
+! # Newfoundland & Labrador P.O. Box 8700, 40 Higgins Line, St. John's NL
+! # A1B 4J6
+  
+  Rule	StJohns	1987	only	-	Apr	Sun>=1	0:01	1:00	D
+  Rule	StJohns	1987	2006	-	Oct	lastSun	0:01	0	S
+--- 1168,1188 ----
+  # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
+  # at 00:01 local time.  For now, assume it started in 1987.
+  
+! # From Michael Pelley (2011-09-12):
+! # We received today, Monday, September 12, 2011, notification that the
+! # changes to the Newfoundland Standard Time Act have been proclaimed.
+! # The change in the Act stipulates that the change from Daylight Savings
+! # Time to Standard Time and from Standard Time to Daylight Savings Time
+! # now occurs at 2:00AM.
+! # ...
+! # 
+! # http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm
+  # 
+  # ...
+! # MICHAEL PELLEY  |  Manager of Enterprise Architecture - Solution Delivery
+! # Office of the Chief Information Officer
+! # Executive Council
+! # Government of Newfoundland & Labrador
+  
+  Rule	StJohns	1987	only	-	Apr	Sun>=1	0:01	1:00	D
+  Rule	StJohns	1987	2006	-	Oct	lastSun	0:01	0	S
+diff -r -c old/zone.tab new/zone.tab
+*** tzdata2011j/zone.tab	Wed Aug 17 13:36:43 2011
+--- tzdata2011k/zone.tab	Tue Sep 20 17:37:30 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)zone.tab	8.47
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  #
+--- 1,5 ----
+  # 
    +! # @(#)zone.tab	8.49
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  #
+***************
+*** 319,325 ****
+  PM	+4703-05620	America/Miquelon
+  PN	-2504-13005	Pacific/Pitcairn
+  PR	+182806-0660622	America/Puerto_Rico
+! PS	+3130+03428	Asia/Gaza
+  PT	+3843-00908	Europe/Lisbon	mainland
+  PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+  PT	+3744-02540	Atlantic/Azores	Azores
+--- 319,326 ----
+  PM	+4703-05620	America/Miquelon
+  PN	-2504-13005	Pacific/Pitcairn
+  PR	+182806-0660622	America/Puerto_Rico
+! PS	+3130+03428	Asia/Gaza	Gaza Strip
+! PS	+313200+0350542	Asia/Hebron	West Bank
+  PT	+3843-00908	Europe/Lisbon	mainland
+  PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+  PT	+3744-02540	Atlantic/Azores	Azores
diff --git a/tzdata-2011i-kemerovo.patch b/tzdata-2011j-kemerovo.patch
similarity index 81%
rename from tzdata-2011i-kemerovo.patch
rename to tzdata-2011j-kemerovo.patch
index ef52390..bd515ad 100644
--- a/tzdata-2011i-kemerovo.patch
+++ b/tzdata-2011j-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011h/europe\~ tzdata2011h/europe
---- tzdata2011i/europe~	2011-06-15 13:31:00.000000000 +0200
-+++ tzdata2011i/europe	2011-06-27 16:49:39.323493224 +0200
+--- tzdata2011j/europe~	2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011j/europe	2011-06-27 16:49:39.323493224 +0200
 @@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index 85a1346..3bc322f 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011i
-%define tzdata_version 2011i
+Version: 2011k
+%define tzdata_version 2011j
 %define tzcode_version 2011i
-Release: 1%{?dist}
+Release: 0.1.20110921%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,7 +17,8 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011i-kemerovo.patch
+Patch1: tzdata-2011j-kemerovo.patch
+Patch2: tzdata-2011j-k.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,17 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Sep 21 2011 Petr Machata  - 2011k-0.1.20110921
+- Upstream 2011j:
+  - Fix the Samoa date line skip
+  - Changes in past timestamp typos several Africa zones
+- Proposed upstream 2011k:
+  - Belarus and Ukraine adopt permanent DST in 2011
+  - Palestine suspends DST during Ramadan in 2011
+  - Gaza and West Bank split in 2011.  West Bank is tracked in the
+    timezone Asia/Hebron.  zone.tab update accordingly.
+- Resolves: #737896
+
 * Mon Aug 29 2011 Petr Machata  - 2011h-1
 - Upstream 2011i:
   - Add Africa/Juba (South Sudan) zone

From fecaadd1794376239ab132a56abb355d508c369f Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 11 Oct 2011 16:29:34 +0200
Subject: [PATCH 157/280] Upstream 2011l:

- Fix ancient stamps for America/Sitka
- Asia/Hebron transitioned to standard time already on Sep 30, not Oct 3
- Fiji will introduce DST on Oct 22
---
 .gitignore                                    |   1 +
 sources                                       |   2 +-
 tzdata-2011j-k.patch                          | 451 ------------------
 ...erovo.patch => tzdata-2011l-kemerovo.patch |   4 +-
 tzdata.spec                                   |  16 +-
 5 files changed, 14 insertions(+), 460 deletions(-)
 delete mode 100644 tzdata-2011j-k.patch
 rename tzdata-2011j-kemerovo.patch => tzdata-2011l-kemerovo.patch (81%)

diff --git a/.gitignore b/.gitignore
index ff3ccb8..025ac80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@ noarch/
 /tzdata2011i.tar.gz
 /tzcode2011i.tar.gz
 /tzdata2011j.tar.gz
+/tzdata2011l.tar.gz
diff --git a/sources b/sources
index c38fd86..38f7a00 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
 cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
-30a6bebdbdd03c5bd29241c15f569d50  tzdata2011j.tar.gz
+bae1b93673e1aef80186c90dfd493f1c  tzdata2011l.tar.gz
diff --git a/tzdata-2011j-k.patch b/tzdata-2011j-k.patch
deleted file mode 100644
index c4341b2..0000000
--- a/tzdata-2011j-k.patch
+++ /dev/null
@@ -1,451 +0,0 @@
-diff -r -c old/asia new/asia
-*** tzdata2011j/asia	Sat Sep  3 08:28:37 2011
---- tzdata2011k/asia	Tue Sep 20 17:54:03 2011
-***************
-*** 1,4 ****
-! # @(#)asia	8.65
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,4 ----
-! # @(#)asia	8.68
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 2194,2200 ****
---- 2194,2230 ----
-  # http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
-  # 
-  
-+ # From Steffen Thorsen (2011-08-26):
-+ # Gaza and the West Bank did go back to standard time in the beginning of
-+ # August, and will now enter daylight saving time again on 2011-08-30
-+ # 00:00 (so two periods of DST in 2011). The pause was because of
-+ # Ramadan.
-+ #
-+ # 
-+ # http://www.maannews.net/eng/ViewDetails.aspx?ID=416217
-+ # 
-+ # Additional info:
-+ # 
-+ # http://www.timeanddate.com/news/time/palestine-dst-2011.html
-+ # 
-+ 
-+ # From Alexander Krivenyshev (2011-08-27):
-+ # According to the article in The Jerusalem Post:
-+ # "...Earlier this month, the Palestinian government in the West Bank decided to
-+ # move to standard time for 30 days, during Ramadan. The Palestinians in the
-+ # Gaza Strip accepted the change and also moved their clocks one hour back.
-+ # The Hamas government said on Saturday that it won't observe summertime after
-+ # the Muslim feast of Id al-Fitr, which begins on Tuesday..."
-+ # ...
-+ # 
-+ # http://www.jpost.com/MiddleEast/Article.aspx?id=235650
-+ # 
-+ # or
-+ # 
-+ # http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html
-+ # 
-  # The rules for Egypt are stolen from the `africa' file.
-+ 
-  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-  Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
-  Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
-***************
-*** 2210,2221 ****
-  Rule Palestine	2006	2008	-	Apr	 1	0:00	1:00	S
-  Rule Palestine	2006	only	-	Sep	22	0:00	0	-
-  Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
-! Rule Palestine	2008	only	-	Aug	lastFri	2:00	0	-
-  Rule Palestine	2009	only	-	Mar	lastFri	0:00	1:00	S
-! Rule Palestine	2010	max	-	Mar	lastSat	0:01	1:00	S
-! Rule Palestine	2009	max	-	Sep	Fri>=1	2:00	0	-
-  Rule Palestine	2010	only	-	Aug	11	0:00	0	-
-  
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
-  			2:00	Zion	EET	1948 May 15
---- 2240,2254 ----
-  Rule Palestine	2006	2008	-	Apr	 1	0:00	1:00	S
-  Rule Palestine	2006	only	-	Sep	22	0:00	0	-
-  Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
-! Rule Palestine	2008	only	-	Aug	lastFri	0:00	0	-
-  Rule Palestine	2009	only	-	Mar	lastFri	0:00	1:00	S
-! Rule Palestine	2009	only	-	Sep	Fri>=1	2:00	0	-
-! Rule Palestine	2010	only	-	Mar	lastSat	0:01	1:00	S
-  Rule Palestine	2010	only	-	Aug	11	0:00	0	-
-  
-+ # From Arthur David Olson (2011-09-20):
-+ # 2011 transitions per http://www.timeanddate.com as of 2011-09-20.
-+ 
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
-  			2:00	Zion	EET	1948 May 15
-***************
-*** 2222,2229 ****
-  			2:00 EgyptAsia	EE%sT	1967 Jun  5
-  			2:00	Zion	I%sT	1996
-  			2:00	Jordan	EE%sT	1999
-! 			2:00 Palestine	EE%sT
-  
-  # Paracel Is
-  # no information
-  
---- 2255,2277 ----
-  			2:00 EgyptAsia	EE%sT	1967 Jun  5
-  			2:00	Zion	I%sT	1996
-  			2:00	Jordan	EE%sT	1999
-! 			2:00 Palestine	EE%sT	2011 Apr  2 12:01
-! 			2:00	1:00	EEST	2011 Aug  1
-! 			2:00	-	EET
-  
-+ Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
-+ 			2:00	Zion	EET	1948 May 15
-+ 			2:00 EgyptAsia	EE%sT	1967 Jun  5
-+ 			2:00	Zion	I%sT	1996
-+ 			2:00	Jordan	EE%sT	1999
-+ 			2:00 Palestine	EE%sT	2008 Aug
-+ 			2:00 	1:00	EEST	2008 Sep
-+ 			2:00 Palestine	EE%sT	2011 Apr  1 12:01
-+ 			2:00	1:00	EEST	2011 Aug  1
-+ 			2:00	-	EET	2011 Aug 30
-+ 			2:00	1:00	EEST	2011 Oct  3 3:00
-+ 			2:00	-	EET
-+ 
-  # Paracel Is
-  # no information
-  
-diff -r -c old/europe new/europe
-*** tzdata2011j/europe	Wed Aug 17 12:52:01 2011
---- tzdata2011k/europe	Tue Sep 20 17:44:59 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)europe	8.34
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)europe	8.38
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 561,569 ****
-  #
-  Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
-  Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
-! Rule	Russia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
-  Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
-! Rule	Russia	1996	max	-	Oct	lastSun	 2:00s	0	-
-  
-  # From Alexander Krivenyshev (2011-06-14):
-  # According to Kremlin press service, Russian President Dmitry Medvedev
---- 561,569 ----
-  #
-  Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
-  Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
-! Rule	Russia	1993	2010	-	Mar	lastSun	 2:00s	1:00	S
-  Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
-! Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
-  
-  # From Alexander Krivenyshev (2011-06-14):
-  # According to Kremlin press service, Russian President Dmitry Medvedev
-***************
-*** 583,589 ****
-  # From Arthur David Olson (2011-06-15):
-  # Take "abolishing daylight saving time" to mean that time is now considered
-  # to be standard.
-- # At least for now, keep the "old" Russia rules for the benefit of Belarus.
-  
-  # These are for backward compatibility with older versions.
-  
---- 583,588 ----
-***************
-*** 689,694 ****
---- 688,710 ----
-  			1:00	EU	CE%sT
-  
-  # Belarus
-+ # From Yauhen Kharuzhy (2011-09-16):
-+ # By latest Belarus government act Europe/Minsk timezone was changed to
-+ # GMT+3 without DST (was GMT+2 with DST).
-+ #
-+ # Sources (Russian language):
-+ # 1.
-+ # 
-+ # http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
-+ # 
-+ # 2.
-+ # 
-+ # http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
-+ # 
-+ # 3.
-+ # 
-+ # http://news.tut.by/society/250578.html
-+ # 
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone	Europe/Minsk	1:50:16 -	LMT	1880
-  			1:50	-	MMT	1924 May 2 # Minsk Mean Time
-***************
-*** 700,706 ****
-  			2:00	1:00	EEST	1991 Sep 29 2:00s
-  			2:00	-	EET	1992 Mar 29 0:00s
-  			2:00	1:00	EEST	1992 Sep 27 0:00s
-! 			2:00	Russia	EE%sT
-  
-  # Belgium
-  #
---- 716,723 ----
-  			2:00	1:00	EEST	1991 Sep 29 2:00s
-  			2:00	-	EET	1992 Mar 29 0:00s
-  			2:00	1:00	EEST	1992 Sep 27 0:00s
-! 			2:00	Russia	EE%sT	2011 Mar 27 2:00s
-! 			3:00	-	FET # Further-eastern European Time
-  
-  # Belgium
-  #
-***************
-*** 2034,2040 ****
-  			 2:00	Poland	CE%sT	1946
-  			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
-  			 2:00	Russia	EE%sT	2011 Mar 27 2:00s
-! 			 3:00	-	KALT
-  #
-  # From Oscar van Vlijmen (2001-08-25): [This region consists of]
-  # Respublika Adygeya, Arkhangel'skaya oblast',
---- 2051,2057 ----
-  			 2:00	Poland	CE%sT	1946
-  			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
-  			 2:00	Russia	EE%sT	2011 Mar 27 2:00s
-! 			 3:00	-	FET # Further-eastern European Time
-  #
-  # From Oscar van Vlijmen (2001-08-25): [This region consists of]
-  # Respublika Adygeya, Arkhangel'skaya oblast',
-***************
-*** 2189,2195 ****
-  # [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'.
-  
-  # From Oscar van Vlijmen (2009-11-29):
-! # ...some regions of RUssia were merged with others since 2005...
-  # Some names were changed, no big deal, except for one instance: a new name.
-  # YAK/YAKST: UTC+9 Zabajkal'skij kraj.
-  
---- 2206,2212 ----
-  # [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'.
-  
-  # From Oscar van Vlijmen (2009-11-29):
-! # ...some regions of [Russia] were merged with others since 2005...
-  # Some names were changed, no big deal, except for one instance: a new name.
-  # YAK/YAKST: UTC+9 Zabajkal'skij kraj.
-  
-***************
-*** 2613,2618 ****
---- 2630,2657 ----
-  # of March at 3am the time is changing to 4am and each last Sunday of
-  # October the time at 4am is changing to 3am"
-  
-+ # From Alexander Krivenyshev (2011-09-20):
-+ # On September 20, 2011 the deputies of the Verkhovna Rada agreed to
-+ # abolish the transfer clock to winter time.
-+ #
-+ # Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
-+ # approval from 266 deputies.
-+ #
-+ # Ukraine abolishes transter back to the winter time (in Russian)
-+ # 
-+ # http://news.mail.ru/politics/6861560/
-+ # 
-+ #
-+ # The Ukrainians will no longer change the clock (in Russian)
-+ # 
-+ # http://www.segodnya.ua/news/14290482.html
-+ # 
-+ #
-+ # Deputies cancelled the winter time (in Russian)
-+ # 
-+ # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
-+ # 
-+ 
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  # Most of Ukraine since 1970 has been like Kiev.
-  # "Kyiv" is the transliteration of the Ukrainian name, but
-***************
-*** 2626,2632 ****
-  			3:00	-	MSK	1990 Jul  1 2:00
-  			2:00	-	EET	1992
-  			2:00	E-Eur	EE%sT	1995
-! 			2:00	EU	EE%sT
-  # Ruthenia used CET 1990/1991.
-  # "Uzhhorod" is the transliteration of the Ukrainian name, but
-  # "Uzhgorod" is more common in English.
---- 2665,2672 ----
-  			3:00	-	MSK	1990 Jul  1 2:00
-  			2:00	-	EET	1992
-  			2:00	E-Eur	EE%sT	1995
-! 			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-! 			3:00	-	FET # Further-eastern European Time
-  # Ruthenia used CET 1990/1991.
-  # "Uzhhorod" is the transliteration of the Ukrainian name, but
-  # "Uzhgorod" is more common in English.
-***************
-*** 2640,2646 ****
-  			1:00	-	CET	1991 Mar 31 3:00
-  			2:00	-	EET	1992
-  			2:00	E-Eur	EE%sT	1995
-! 			2:00	EU	EE%sT
-  # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
-  # "Zaporizhia" is the transliteration of the Ukrainian name, but
-  # "Zaporozh'ye" is more common in English.  Use the common English
---- 2680,2687 ----
-  			1:00	-	CET	1991 Mar 31 3:00
-  			2:00	-	EET	1992
-  			2:00	E-Eur	EE%sT	1995
-! 			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-! 			3:00	-	FET # Further-eastern European Time
-  # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
-  # "Zaporizhia" is the transliteration of the Ukrainian name, but
-  # "Zaporozh'ye" is more common in English.  Use the common English
-***************
-*** 2653,2659 ****
-  			1:00	C-Eur	CE%sT	1943 Oct 25
-  			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
-  			2:00	E-Eur	EE%sT	1995
-! 			2:00	EU	EE%sT
-  # Central Crimea used Moscow time 1994/1997.
-  Zone Europe/Simferopol	2:16:24 -	LMT	1880
-  			2:16	-	SMT	1924 May  2 # Simferopol Mean T
---- 2694,2701 ----
-  			1:00	C-Eur	CE%sT	1943 Oct 25
-  			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
-  			2:00	E-Eur	EE%sT	1995
-! 			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-! 			3:00	-	FET # Further-eastern European Time
-  # Central Crimea used Moscow time 1994/1997.
-  Zone Europe/Simferopol	2:16:24 -	LMT	1880
-  			2:16	-	SMT	1924 May  2 # Simferopol Mean T
-***************
-*** 2678,2684 ****
-  # Assume it happened in March by not changing the clocks.
-  			3:00	Russia	MSK/MSD	1997
-  			3:00	-	MSK	1997 Mar lastSun 1:00u
-! 			2:00	EU	EE%sT
-  
-  ###############################################################################
-  
---- 2720,2727 ----
-  # Assume it happened in March by not changing the clocks.
-  			3:00	Russia	MSK/MSD	1997
-  			3:00	-	MSK	1997 Mar lastSun 1:00u
-! 			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-! 			3:00	-	FET # Further-eastern European Time
-  
-  ###############################################################################
-  
-diff -r -c old/northamerica new/northamerica
-*** tzdata2011j/northamerica	Wed Aug 17 17:33:36 2011
---- tzdata2011k/northamerica	Tue Sep 20 13:55:04 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)northamerica	8.48
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)northamerica	8.49
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 1168,1198 ****
-  # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
-  # at 00:01 local time.  For now, assume it started in 1987.
-  
-! # From Michael Pelley (2011-08-05):
-! # The Government of Newfoundland and Labrador has pending changes to
-! # modify the hour for daylight savings time to come into effect in
-! # November 2011. This modification would change the time from 12:01AM to
-! # 2:00AM on the dates of the switches of Daylight Savings Time to/from
-! # Standard Time.
-! #
-! # As a matter of reference, in Canada provinces have the authority of
-! # setting time zone information. The legislation has passed our
-! # legislative body (The House of Assembly) and is awaiting the
-! # proclamation to come into effect. You may find this information at:
-! # 
-! # http://www.assembly.nl.ca/legislation/sr/lists/Proclamation.htm
-  # 
-- # and
-- # search within that web page for Standard Time (Amendment) Act. The Act
-- # may be found at:
-- # 
-- # http://www.assembly.nl.ca/business/bills/Bill1106.htm
-- # 
-  # ...
-! # MICHAEL PELLEY | Manager of Enterprise Architecture - Solution Delivery
-! # Office of the Chief Information Officer Executive Council Government of
-! # Newfoundland & Labrador P.O. Box 8700, 40 Higgins Line, St. John's NL
-! # A1B 4J6
-  
-  Rule	StJohns	1987	only	-	Apr	Sun>=1	0:01	1:00	D
-  Rule	StJohns	1987	2006	-	Oct	lastSun	0:01	0	S
---- 1168,1188 ----
-  # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
-  # at 00:01 local time.  For now, assume it started in 1987.
-  
-! # From Michael Pelley (2011-09-12):
-! # We received today, Monday, September 12, 2011, notification that the
-! # changes to the Newfoundland Standard Time Act have been proclaimed.
-! # The change in the Act stipulates that the change from Daylight Savings
-! # Time to Standard Time and from Standard Time to Daylight Savings Time
-! # now occurs at 2:00AM.
-! # ...
-! # 
-! # http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm
-  # 
-  # ...
-! # MICHAEL PELLEY  |  Manager of Enterprise Architecture - Solution Delivery
-! # Office of the Chief Information Officer
-! # Executive Council
-! # Government of Newfoundland & Labrador
-  
-  Rule	StJohns	1987	only	-	Apr	Sun>=1	0:01	1:00	D
-  Rule	StJohns	1987	2006	-	Oct	lastSun	0:01	0	S
-diff -r -c old/zone.tab new/zone.tab
-*** tzdata2011j/zone.tab	Wed Aug 17 13:36:43 2011
---- tzdata2011k/zone.tab	Tue Sep 20 17:37:30 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)zone.tab	8.47
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
---- 1,5 ----
-  # 
    -! # @(#)zone.tab	8.49
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
-***************
-*** 319,325 ****
-  PM	+4703-05620	America/Miquelon
-  PN	-2504-13005	Pacific/Pitcairn
-  PR	+182806-0660622	America/Puerto_Rico
-! PS	+3130+03428	Asia/Gaza
-  PT	+3843-00908	Europe/Lisbon	mainland
-  PT	+3238-01654	Atlantic/Madeira	Madeira Islands
-  PT	+3744-02540	Atlantic/Azores	Azores
---- 319,326 ----
-  PM	+4703-05620	America/Miquelon
-  PN	-2504-13005	Pacific/Pitcairn
-  PR	+182806-0660622	America/Puerto_Rico
-! PS	+3130+03428	Asia/Gaza	Gaza Strip
-! PS	+313200+0350542	Asia/Hebron	West Bank
-  PT	+3843-00908	Europe/Lisbon	mainland
-  PT	+3238-01654	Atlantic/Madeira	Madeira Islands
-  PT	+3744-02540	Atlantic/Azores	Azores
diff --git a/tzdata-2011j-kemerovo.patch b/tzdata-2011l-kemerovo.patch
similarity index 81%
rename from tzdata-2011j-kemerovo.patch
rename to tzdata-2011l-kemerovo.patch
index bd515ad..17a44e6 100644
--- a/tzdata-2011j-kemerovo.patch
+++ b/tzdata-2011l-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011h/europe\~ tzdata2011h/europe
---- tzdata2011j/europe~	2011-06-15 13:31:00.000000000 +0200
-+++ tzdata2011j/europe	2011-06-27 16:49:39.323493224 +0200
+--- tzdata2011l/europe~	2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011l/europe	2011-06-27 16:49:39.323493224 +0200
 @@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index f3a4c2f..c707f2d 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011k
-%define tzdata_version 2011j
+Version: 2011l
+%define tzdata_version 2011l
 %define tzcode_version 2011i
-Release: 0.1.20110921%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,8 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011j-kemerovo.patch
-Patch2: tzdata-2011j-k.patch
+Patch1: tzdata-2011l-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +113,12 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Oct 11 2011 Petr Machata  - 2011l-1
+- Upstream 2011l:
+  - Fix ancient stamps for America/Sitka
+  - Asia/Hebron transitioned to standard time already on Sep 30, not Oct 3
+  - Fiji will introduce DST on Oct 22
+
 * Wed Sep 21 2011 Petr Machata  - 2011k-0.1.20110921
 - Upstream 2011j:
   - Fix the Samoa date line skip

From ff28bf39a86c8e4733128ac07e705d76dfac7362 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 14 Oct 2011 16:52:47 +0200
Subject: [PATCH 158/280] State of Bahia, Brazil, to resume Summer Time on Oct
 16

---
 tzdata-2011l-brazil.patch | 18 ++++++++++++++++++
 tzdata.spec               | 11 +++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 tzdata-2011l-brazil.patch

diff --git a/tzdata-2011l-brazil.patch b/tzdata-2011l-brazil.patch
new file mode 100644
index 0000000..b7a2519
--- /dev/null
+++ b/tzdata-2011l-brazil.patch
@@ -0,0 +1,18 @@
+diff -up tzdata2011l/southamerica\~ tzdata2011l/southamerica
+--- tzdata2011l/southamerica~	2011-10-10 06:15:43.000000000 +0200
++++ tzdata2011l/southamerica	2011-10-14 16:40:35.679270087 +0200
+@@ -1054,10 +1054,8 @@ Zone America/Maceio	-2:22:52 -	LMT	1914
+ # of America/Salvador.
+ Zone America/Bahia	-2:34:04 -	LMT	1914
+ 			-3:00	Brazil	BR%sT	2003 Sep 24
+-			-3:00	-	BRT
+-# as noted above, not yet in operation.
+-#			-3:00	-	BRT	2011 Oct 16
+-#			-3:00	Brazil	BR%sT
++			-3:00	-	BRT	2011 Oct 16
++			-3:00	Brazil	BR%sT
+ #
+ # Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
+ # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),
+
+Diff finished.  Fri Oct 14 16:40:40 2011
diff --git a/tzdata.spec b/tzdata.spec
index c707f2d..805123c 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,10 +3,10 @@ Name: tzdata
 Version: 2011l
 %define tzdata_version 2011l
 %define tzcode_version 2011i
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
-URL: ftp://elsie.nci.nih.gov/pub/
+URL: ftp://munnari.oz.au/pub/
 
 # The tzdata-base-0.tar.bz2 is a simple building infrastructure and
 # a test suite.  It is occasionally updated from glibc sources, and as
@@ -18,6 +18,7 @@ Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011l-kemerovo.patch
+Patch2: tzdata-2011l-brazil.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Fri Oct 14 2011 Petr Machata  - 2011l-2
+- State of Bahia, Brazil, to resume Summer Time on Oct 16
+- The project moved, reflect this in URL
+- Resolves: #746183
+
 * Tue Oct 11 2011 Petr Machata  - 2011l-1
 - Upstream 2011l:
   - Fix ancient stamps for America/Sitka

From 0acc4ba06f36b2b6beec1e4b0f0d4657e590a915 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 19 Oct 2011 15:26:20 +0200
Subject: [PATCH 159/280] Ukraine will enter Winter Time after all

---
 tzdata-2011j-ukraine.patch | 76 ++++++++++++++++++++++++++++++++++++++
 tzdata.spec                |  7 +++-
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011j-ukraine.patch

diff --git a/tzdata-2011j-ukraine.patch b/tzdata-2011j-ukraine.patch
new file mode 100644
index 0000000..626f56a
--- /dev/null
+++ b/tzdata-2011j-ukraine.patch
@@ -0,0 +1,76 @@
+commit 4182c08d1b5d3bc82e834f645abef670d1776659
+Author: tz 
+Date:   Mon Sep 26 21:30:36 2011 +0200
+diff --git a/europe b/europe
+index baed8fe..a2ec972 100644
+--- tzdata2011l/europe
++++ tzdata2011l/europe
+@@ -2613,28 +2630,6 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
+ # of March at 3am the time is changing to 4am and each last Sunday of
+ # October the time at 4am is changing to 3am"
+ 
+-# From Alexander Krivenyshev (2011-09-20):
+-# On September 20, 2011 the deputies of the Verkhovna Rada agreed to
+-# abolish the transfer clock to winter time.
+-#
+-# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
+-# approval from 266 deputies.
+-#
+-# Ukraine abolishes transter back to the winter time (in Russian)
+-# 
+-# http://news.mail.ru/politics/6861560/
+-# 
+-#
+-# The Ukrainians will no longer change the clock (in Russian)
+-# 
+-# http://www.segodnya.ua/news/14290482.html
+-# 
+-#
+-# Deputies cancelled the winter time (in Russian)
+-# 
+-# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
+-# 
+-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Most of Ukraine since 1970 has been like Kiev.
+ # "Kyiv" is the transliteration of the Ukrainian name, but
+@@ -2626,8 +2665,7 @@ Zone Europe/Kiev	2:02:04 -	LMT	1880
+ 			3:00	-	MSK	1990 Jul  1 2:00
+ 			2:00	-	EET	1992
+ 			2:00	E-Eur	EE%sT	1995
++			2:00	EU	EE%sT
+-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+-			3:00	-	FET # Further-eastern European Time
+ # Ruthenia used CET 1990/1991.
+ # "Uzhhorod" is the transliteration of the Ukrainian name, but
+ # "Uzhgorod" is more common in English.
+@@ -2640,8 +2680,7 @@ Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 Oct
+ 			1:00	-	CET	1991 Mar 31 3:00
+ 			2:00	-	EET	1992
+ 			2:00	E-Eur	EE%sT	1995
++			2:00	EU	EE%sT
+-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+-			3:00	-	FET # Further-eastern European Time
+ # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
+ # "Zaporizhia" is the transliteration of the Ukrainian name, but
+ # "Zaporozh'ye" is more common in English.  Use the common English
+@@ -2653,8 +2694,7 @@ Zone Europe/Zaporozhye	2:20:40 -	LMT	1880
+ 			1:00	C-Eur	CE%sT	1943 Oct 25
+ 			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
+ 			2:00	E-Eur	EE%sT	1995
++			2:00	EU	EE%sT
+-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+-			3:00	-	FET # Further-eastern European Time
+ # Central Crimea used Moscow time 1994/1997.
+ Zone Europe/Simferopol	2:16:24 -	LMT	1880
+ 			2:16	-	SMT	1924 May  2 # Simferopol Mean T
+@@ -2678,8 +2720,7 @@ Zone Europe/Simferopol	2:16:24 -	LMT	1880
+ # Assume it happened in March by not changing the clocks.
+ 			3:00	Russia	MSK/MSD	1997
+ 			3:00	-	MSK	1997 Mar lastSun 1:00u
++			2:00	EU	EE%sT
+-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+-			3:00	-	FET # Further-eastern European Time
+ 
+ ###############################################################################
+ 
diff --git a/tzdata.spec b/tzdata.spec
index 805123c..3cc4f50 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011l
 %define tzdata_version 2011l
 %define tzcode_version 2011i
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -19,6 +19,7 @@ Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011l-kemerovo.patch
 Patch2: tzdata-2011l-brazil.patch
+Patch3: tzdata-2011j-ukraine.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +55,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 # __apply_patches
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +117,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Oct 19 2011 Petr Machata  - 2011l-3
+- Ukraine will enter Winter Time after all
+
 * Fri Oct 14 2011 Petr Machata  - 2011l-2
 - State of Bahia, Brazil, to resume Summer Time on Oct 16
 - The project moved, reflect this in URL

From da082e26ffff27a5bb298013a73b2e903f28832d Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 31 Oct 2011 16:04:44 +0100
Subject: [PATCH 160/280] Rebase to 2011n

---
 .gitignore                  |  1 +
 sources                     |  2 +-
 tzdata-2011j-ukraine.patch  | 76 -------------------------------------
 tzdata-2011l-brazil.patch   | 18 ---------
 tzdata-2011l-kemerovo.patch | 16 --------
 tzdata.spec                 | 20 +++++-----
 6 files changed, 13 insertions(+), 120 deletions(-)
 delete mode 100644 tzdata-2011j-ukraine.patch
 delete mode 100644 tzdata-2011l-brazil.patch
 delete mode 100644 tzdata-2011l-kemerovo.patch

diff --git a/.gitignore b/.gitignore
index 025ac80..5e0ecd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,4 @@ noarch/
 /tzcode2011i.tar.gz
 /tzdata2011j.tar.gz
 /tzdata2011l.tar.gz
+/tzdata2011n.tar.gz
diff --git a/sources b/sources
index 38f7a00..34317a8 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
 cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
-bae1b93673e1aef80186c90dfd493f1c  tzdata2011l.tar.gz
+20dbfb28efa008ddbf6dd34601ea40fa  tzdata2011n.tar.gz
diff --git a/tzdata-2011j-ukraine.patch b/tzdata-2011j-ukraine.patch
deleted file mode 100644
index 626f56a..0000000
--- a/tzdata-2011j-ukraine.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-commit 4182c08d1b5d3bc82e834f645abef670d1776659
-Author: tz 
-Date:   Mon Sep 26 21:30:36 2011 +0200
-diff --git a/europe b/europe
-index baed8fe..a2ec972 100644
---- tzdata2011l/europe
-+++ tzdata2011l/europe
-@@ -2613,28 +2630,6 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
- # of March at 3am the time is changing to 4am and each last Sunday of
- # October the time at 4am is changing to 3am"
- 
--# From Alexander Krivenyshev (2011-09-20):
--# On September 20, 2011 the deputies of the Verkhovna Rada agreed to
--# abolish the transfer clock to winter time.
--#
--# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
--# approval from 266 deputies.
--#
--# Ukraine abolishes transter back to the winter time (in Russian)
--# 
--# http://news.mail.ru/politics/6861560/
--# 
--#
--# The Ukrainians will no longer change the clock (in Russian)
--# 
--# http://www.segodnya.ua/news/14290482.html
--# 
--#
--# Deputies cancelled the winter time (in Russian)
--# 
--# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
--# 
--
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- # Most of Ukraine since 1970 has been like Kiev.
- # "Kyiv" is the transliteration of the Ukrainian name, but
-@@ -2626,8 +2665,7 @@ Zone Europe/Kiev	2:02:04 -	LMT	1880
- 			3:00	-	MSK	1990 Jul  1 2:00
- 			2:00	-	EET	1992
- 			2:00	E-Eur	EE%sT	1995
-+			2:00	EU	EE%sT
--			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
--			3:00	-	FET # Further-eastern European Time
- # Ruthenia used CET 1990/1991.
- # "Uzhhorod" is the transliteration of the Ukrainian name, but
- # "Uzhgorod" is more common in English.
-@@ -2640,8 +2680,7 @@ Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 Oct
- 			1:00	-	CET	1991 Mar 31 3:00
- 			2:00	-	EET	1992
- 			2:00	E-Eur	EE%sT	1995
-+			2:00	EU	EE%sT
--			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
--			3:00	-	FET # Further-eastern European Time
- # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
- # "Zaporizhia" is the transliteration of the Ukrainian name, but
- # "Zaporozh'ye" is more common in English.  Use the common English
-@@ -2653,8 +2694,7 @@ Zone Europe/Zaporozhye	2:20:40 -	LMT	1880
- 			1:00	C-Eur	CE%sT	1943 Oct 25
- 			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
- 			2:00	E-Eur	EE%sT	1995
-+			2:00	EU	EE%sT
--			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
--			3:00	-	FET # Further-eastern European Time
- # Central Crimea used Moscow time 1994/1997.
- Zone Europe/Simferopol	2:16:24 -	LMT	1880
- 			2:16	-	SMT	1924 May  2 # Simferopol Mean T
-@@ -2678,8 +2720,7 @@ Zone Europe/Simferopol	2:16:24 -	LMT	1880
- # Assume it happened in March by not changing the clocks.
- 			3:00	Russia	MSK/MSD	1997
- 			3:00	-	MSK	1997 Mar lastSun 1:00u
-+			2:00	EU	EE%sT
--			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
--			3:00	-	FET # Further-eastern European Time
- 
- ###############################################################################
- 
diff --git a/tzdata-2011l-brazil.patch b/tzdata-2011l-brazil.patch
deleted file mode 100644
index b7a2519..0000000
--- a/tzdata-2011l-brazil.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up tzdata2011l/southamerica\~ tzdata2011l/southamerica
---- tzdata2011l/southamerica~	2011-10-10 06:15:43.000000000 +0200
-+++ tzdata2011l/southamerica	2011-10-14 16:40:35.679270087 +0200
-@@ -1054,10 +1054,8 @@ Zone America/Maceio	-2:22:52 -	LMT	1914
- # of America/Salvador.
- Zone America/Bahia	-2:34:04 -	LMT	1914
- 			-3:00	Brazil	BR%sT	2003 Sep 24
--			-3:00	-	BRT
--# as noted above, not yet in operation.
--#			-3:00	-	BRT	2011 Oct 16
--#			-3:00	Brazil	BR%sT
-+			-3:00	-	BRT	2011 Oct 16
-+			-3:00	Brazil	BR%sT
- #
- # Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
- # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),
-
-Diff finished.  Fri Oct 14 16:40:40 2011
diff --git a/tzdata-2011l-kemerovo.patch b/tzdata-2011l-kemerovo.patch
deleted file mode 100644
index 17a44e6..0000000
--- a/tzdata-2011l-kemerovo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up tzdata2011h/europe\~ tzdata2011h/europe
---- tzdata2011l/europe~	2011-06-15 13:31:00.000000000 +0200
-+++ tzdata2011l/europe	2011-06-27 16:49:39.323493224 +0200
-@@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
- 			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
- 			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
- 			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
--			 6:00	Russia	NOV%sT	2011 Mar 27 2:00s
--			 7:00	-	NOVT # Novosibirsk/Novokuznetsk Time
-+			 6:00	Russia	OMS%sT	2011 Mar 27 2:00s
-+			 7:00	-	OMST # Novosibirsk/Novokuznetsk Time
- 
- #
- # From Oscar van Vlijmen (2001-08-25): [This region consists of]
-
-Diff finished.  Mon Jun 27 16:49:45 2011
diff --git a/tzdata.spec b/tzdata.spec
index 3cc4f50..a3b613e 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011l
-%define tzdata_version 2011l
+Version: 2011n
+%define tzdata_version 2011n
 %define tzcode_version 2011i
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -17,9 +17,6 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011l-kemerovo.patch
-Patch2: tzdata-2011l-brazil.patch
-Patch3: tzdata-2011j-ukraine.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,9 +50,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
 # __end
 
 mkdir javazic
@@ -117,6 +111,14 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Oct 31 2011 Petr Machata  - 2011l-1
+- Rebase to 2011n
+  - Drop all patches, including the Kemerovo patch, which is not in
+    upstream
+  - Cuba postponed DST by two weeks to Nov 13
+  - Fiji will enter DST on Jan 21
+- Resolved: #748778
+
 * Wed Oct 19 2011 Petr Machata  - 2011l-3
 - Ukraine will enter Winter Time after all
 

From 81ac29046466476ffc6dcaddc9721475b78aa53e Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Thu, 3 Nov 2011 22:27:14 +0100
Subject: [PATCH 161/280] Fix building of Java zones

---
 javazic-exclusion-fix.patch | 42 +++++++++++++++++++++++++++++++++++++
 tzdata.spec                 | 11 +++++++---
 2 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 javazic-exclusion-fix.patch

diff --git a/javazic-exclusion-fix.patch b/javazic-exclusion-fix.patch
new file mode 100644
index 0000000..b9dfa4b
--- /dev/null
+++ b/javazic-exclusion-fix.patch
@@ -0,0 +1,42 @@
+# Patch based on fix in JDK8 tree by Yuka Kamiya from Oracle:
+# http://hg.openjdk.java.net/jdk8/tl/jdk/rev/f114bddac6d6
+
+diff -up ./sun/tools/javazic/Mappings.java.sav ./sun/tools/javazic/Mappings.java
+--- ./sun/tools/javazic/Mappings.java.sav	2011-11-03 16:31:53.000000000 -0400
++++ ./sun/tools/javazic/Mappings.java	2011-11-03 16:41:44.000000000 -0400
+@@ -77,15 +77,17 @@ class Mappings {
+ 	    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.
+-	    if (zone.size() > 1) {
+-		ZoneRec zrec = zone.get(zone.size()-2);
++	    boolean isExcluded = false;
++	    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) {
+ 			excludeList = new ArrayList();
+ 		    }
+ 		    excludeList.add(zone.getName());
+-		    continue;
++		    isExcluded = true;
++		    break;
+ 		}
+ 	    }
+ 
+@@ -101,9 +103,13 @@ class Mappings {
+ 		rawOffsetsIndex.add(i, rawOffset);
+ 
+ 		Set perRawOffset = new TreeSet();
++		if (!isExcluded) {
++		    perRawOffset = new TreeSet();
++		}
++
+ 		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/tzdata.spec b/tzdata.spec
index a3b613e..7cb4598 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011n
 %define tzdata_version 2011n
 %define tzcode_version 2011i
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -34,7 +34,8 @@ the world.
 Summary: Timezone data for Java
 Group: System Environment/Base
 Source3: javazic.tar.gz
-Patch0: javazic-fixup.patch
+Patch100: javazic-fixup.patch
+Patch101: javazic-exclusion-fix.patch
 
 %description java
 This package contains timezone information for use by Java runtimes.
@@ -55,7 +56,8 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
 pushd javazic
-%patch0
+%patch100
+%patch101
 
 # Hack alert! sun.tools may be defined and installed in the
 # VM. In order to guarantee that we are using IcedTea/OpenJDK
@@ -111,6 +113,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Nov  3 2011 Petr Machata  - 2011n-2
+- Fix building of Java zones.  Patch by Deepak Bhole
+
 * Mon Oct 31 2011 Petr Machata  - 2011l-1
 - Rebase to 2011n
   - Drop all patches, including the Kemerovo patch, which is not in

From eaa29083205ee0d986c9293a4e900ac7a7122f54 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore 
Date: Sat, 14 Jan 2012 01:23:13 -0600
Subject: [PATCH 162/280] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 tzdata.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index 7cb4598..1f3387d 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011n
 %define tzdata_version 2011n
 %define tzcode_version 2011i
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -113,6 +113,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Sat Jan 14 2012 Fedora Release Engineering  - 2011n-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Thu Nov  3 2011 Petr Machata  - 2011n-2
 - Fix building of Java zones.  Patch by Deepak Bhole
 

From 1f2b5dd8fd7f2a98eab4bdecc8167e7ed34b85dd Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 21 Feb 2012 14:50:59 +0100
Subject: [PATCH 163/280] Add a patch for the leap second that will occur this
 summer

---
 tzdata-2011n-leapsec.patch | 77 ++++++++++++++++++++++++++++++++++++++
 tzdata.spec                |  7 +++-
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011n-leapsec.patch

diff --git a/tzdata-2011n-leapsec.patch b/tzdata-2011n-leapsec.patch
new file mode 100644
index 0000000..ee8c90b
--- /dev/null
+++ b/tzdata-2011n-leapsec.patch
@@ -0,0 +1,77 @@
+--- leapseconds	2012-01-06 10:47:32.000000000 +0000
++++ leapseconds.new	2012-01-06 10:49:42.000000000 +0000
+@@ -48,40 +48,53 @@
+ Leap	1998	Dec	31	23:59:60	+	S
+ Leap	2005	Dec	31	23:59:60	+	S
+ Leap	2008	Dec	31	23:59:60	+	S
++Leap	2012	Jun	30	23:59:60	+	S
+ 
+-# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
++#      INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
+ #
+ # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
+ #
+ # SERVICE DE LA ROTATION TERRESTRE
+ # OBSERVATOIRE DE PARIS
+ # 61, Av. de l'Observatoire 75014 PARIS (France)
+-# Tel.      : 33 (0) 1 40 51 22 29
++# Tel.      : 33 (0) 1 40 51 22 26
+ # FAX       : 33 (0) 1 40 51 22 91
+-# Internet  : services.iers@obspm.fr
++# e-mail    : services.iers@obspm.fr
++# http://hpiers.obspm.fr/eop-pc
+ #
+-# Paris, 2 February 2011
++#                                               Paris, 5 January 2012
+ #
+-# Bulletin C 41
++#                                               Bulletin C 43
+ #
+-# To authorities responsible
+-# for the measurement and
+-# distribution of time
++#                                               To authorities responsible
++#                                               for the measurement and
++#                                               distribution of time
+ #
+-# INFORMATION ON UTC - TAI
+ #
+-# NO positive leap second will be introduced at the end of June 2011.
+-# The difference between Coordinated Universal Time UTC and the
+-# International Atomic Time TAI is :		
++#                                    UTC TIME STEP
++#                             on the 1st of July 2012
+ #
+-# from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
+ #
+-# Leap seconds can be introduced in UTC at the end of the months of December
+-# or June,  depending on the evolution of UT1-TAI. Bulletin C is mailed every
+-# six months, either to announce a time step in UTC, or to confirm that there
+-# will be no time step at the next possible date.
++#  A positive leap second will be introduced at the end of June 2012.
++#  The sequence of dates of the UTC second markers will be:
+ #
+-# Daniel GAMBIS
+-# Head			
+-# Earth Orientation Center of the IERS
+-# Observatoire de Paris, France
++#                           2012 June 30,     23h 59m 59s
++#                           2012 June 30,     23h 59m 60s
++#                           2012 July  1,      0h  0m  0s
++#
++#  The difference between UTC and the International Atomic Time TAI is:
++#
++#   from 2009 January 1, 0h UTC, to 2012 July 1  0h UTC  : UTC-TAI = - 34s
++#   from 2012 July 1,    0h UTC, until further notice    : UTC-TAI = - 35s
++#
++#  Leap seconds can be introduced in UTC at the end of the months of December
++#  or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
++#  six months, either to announce a time step in UTC or to confirm that there
++#  will be no time step at the next possible date.
++#
++#
++#
++#                                               Daniel GAMBIS
++#                                               Head
++#                                               Earth Orientation Center of IERS
++#                                               Observatoire de Paris, France
diff --git a/tzdata.spec b/tzdata.spec
index 7cb4598..dacd5a2 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011n
 %define tzdata_version 2011n
 %define tzcode_version 2011i
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -17,6 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
+Patch0: tzdata-2011n-leapsec.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +52,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
+%patch0 -d tzdata%{tzdata_version}
 # __end
 
 mkdir javazic
@@ -113,6 +115,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Feb 21 2012 Petr Machata  - 2011n-3
+- Add a patch for the leap second that will occur this summer
+
 * Thu Nov  3 2011 Petr Machata  - 2011n-2
 - Fix building of Java zones.  Patch by Deepak Bhole
 

From 66f71842e975d5a8391df81c5fde8398e8db47f8 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 24 Feb 2012 13:44:13 +0100
Subject: [PATCH 164/280] Add a patch for change in Chilean DST

---
 tzdata-2011n-chile.patch | 43 ++++++++++++++++++++++++++++++++++++++++
 tzdata.spec              | 17 ++++++++++++----
 2 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 tzdata-2011n-chile.patch

diff --git a/tzdata-2011n-chile.patch b/tzdata-2011n-chile.patch
new file mode 100644
index 0000000..c76be8c
--- /dev/null
+++ b/tzdata-2011n-chile.patch
@@ -0,0 +1,43 @@
+--- southamerica.orig	2012-02-23 10:18:06.000000000 -0300
++++ southamerica	2012-02-23 10:47:39.000000000 -0300
+@@ -1219,4 +1219,24 @@
+ # which will be reevaluated in 2012.
+ 
++# From Mauricio Parada 
++# [edited by Glenn Eychaner ]
++#
++# As stated in the website of the Chilean Energy Ministry
++# 
++# http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html
++# 
++# The Chilean Government has decided to postpone the entrance into winter time
++# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not
++# been yet formalized but it will within the next days.
++# Quote from the website communication:
++#
++# 6. For the year 2012, the dates of entry into winter time will be as follows:
++# a. Saturday April 28, 2012, clocks should go back 60 minutes; that is, at
++# 23:59:59, instead of passing to 0:00, the time should be adjusted to be 23:00
++# of the same day.
++# b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is,
++# at 23:59:59, instead of passing to 0:00, the time should be adjusted to be
++# 01:00 on September 2.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
+@@ -1250,5 +1270,6 @@
+ Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+-Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
++Rule	Chile	2012	only	-	Sep 2	4:00u	1:00	S
++Rule	Chile	2013	max	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
+ # N.B.: the end of March 29 in Chile is March 30 in Universal time,
+@@ -1258,5 +1279,6 @@
+ Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
+ Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
+-Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
++Rule	Chile	2012	only	-	Apr 29	3:00u	0	-
++Rule	Chile	2013	max	-	Mar	Sun>=9	3:00u	0	-
+ # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+ # (1996-09) says 1998-03-08.  Ignore these.
diff --git a/tzdata.spec b/tzdata.spec
index dacd5a2..9677d08 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011n
 %define tzdata_version 2011n
 %define tzcode_version 2011i
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -14,10 +14,11 @@ URL: ftp://munnari.oz.au/pub/
 # final zoneinfo files.
 Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
-Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
-Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
+Source1: ftp://munnari.oz.au/pub/tzdata%{tzdata_version}.tar.gz
+Source2: ftp://munnari.oz.au/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch0: tzdata-2011n-leapsec.patch
+Patch1: tzdata-2011n-chile.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,9 +52,13 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version}
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+
+pushd tzdata%{tzdata_version}
 # __apply_patches
-%patch0 -d tzdata%{tzdata_version}
+%patch0 -p0
+%patch1 -p0
 # __end
+popd
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -115,6 +120,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Fri Feb 24 2012 Petr Machata  - 2011n-4
+- Add a patch for change in Chilean DST
+- Update URLs
+
 * Tue Feb 21 2012 Petr Machata  - 2011n-3
 - Add a patch for the leap second that will occur this summer
 

From d7aeec37608645595a7badc571380ae478d1c049 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 7 Mar 2012 00:10:29 +0100
Subject: [PATCH 165/280] Rebase to 2012b

- Changes to zones for Antarctica stations
- Armenia abolished DST in 2012 and forward
- Cuba enters DST on 31st March
- Falkland Islands will stay on permanent Summer Time
- New zone for Creston Valley, Canada, which differs from Dawson
  Creek in past stamps.  Changes to historical stamps in Canada.
- Last year, Tokelau skipped over the date line together with Samoa
---
 .gitignore                 |  2 +
 sources                    |  4 +-
 tzdata-2011n-chile.patch   | 43 ---------------------
 tzdata-2011n-leapsec.patch | 77 --------------------------------------
 tzdata.spec                | 22 +++++++----
 5 files changed, 18 insertions(+), 130 deletions(-)
 delete mode 100644 tzdata-2011n-chile.patch
 delete mode 100644 tzdata-2011n-leapsec.patch

diff --git a/.gitignore b/.gitignore
index 5e0ecd1..2d6b2c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,5 @@ noarch/
 /tzdata2011j.tar.gz
 /tzdata2011l.tar.gz
 /tzdata2011n.tar.gz
+/tzdata2012b.tar.gz
+/tzcode2012b.tar.gz
diff --git a/sources b/sources
index 34317a8..ffecb40 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
-20dbfb28efa008ddbf6dd34601ea40fa  tzdata2011n.tar.gz
+0615fd29def380a917e528433c820368  tzdata2012b.tar.gz
+6137322ffd36e1fd5128885be1c57008  tzcode2012b.tar.gz
diff --git a/tzdata-2011n-chile.patch b/tzdata-2011n-chile.patch
deleted file mode 100644
index c76be8c..0000000
--- a/tzdata-2011n-chile.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- southamerica.orig	2012-02-23 10:18:06.000000000 -0300
-+++ southamerica	2012-02-23 10:47:39.000000000 -0300
-@@ -1219,4 +1219,24 @@
- # which will be reevaluated in 2012.
- 
-+# From Mauricio Parada 
-+# [edited by Glenn Eychaner ]
-+#
-+# As stated in the website of the Chilean Energy Ministry
-+# 
-+# http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html
-+# 
-+# The Chilean Government has decided to postpone the entrance into winter time
-+# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not
-+# been yet formalized but it will within the next days.
-+# Quote from the website communication:
-+#
-+# 6. For the year 2012, the dates of entry into winter time will be as follows:
-+# a. Saturday April 28, 2012, clocks should go back 60 minutes; that is, at
-+# 23:59:59, instead of passing to 0:00, the time should be adjusted to be 23:00
-+# of the same day.
-+# b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is,
-+# at 23:59:59, instead of passing to 0:00, the time should be adjusted to be
-+# 01:00 on September 2.
-+
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
- Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
-@@ -1250,5 +1270,6 @@
- Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
- Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
--Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
-+Rule	Chile	2012	only	-	Sep 2	4:00u	1:00	S
-+Rule	Chile	2013	max	-	Oct	Sun>=9	4:00u	1:00	S
- Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
- # N.B.: the end of March 29 in Chile is March 30 in Universal time,
-@@ -1258,5 +1279,6 @@
- Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
- Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
--Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
-+Rule	Chile	2012	only	-	Apr 29	3:00u	0	-
-+Rule	Chile	2013	max	-	Mar	Sun>=9	3:00u	0	-
- # IATA SSIM anomalies: (1992-02) says 1992-03-14;
- # (1996-09) says 1998-03-08.  Ignore these.
diff --git a/tzdata-2011n-leapsec.patch b/tzdata-2011n-leapsec.patch
deleted file mode 100644
index ee8c90b..0000000
--- a/tzdata-2011n-leapsec.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- leapseconds	2012-01-06 10:47:32.000000000 +0000
-+++ leapseconds.new	2012-01-06 10:49:42.000000000 +0000
-@@ -48,40 +48,53 @@
- Leap	1998	Dec	31	23:59:60	+	S
- Leap	2005	Dec	31	23:59:60	+	S
- Leap	2008	Dec	31	23:59:60	+	S
-+Leap	2012	Jun	30	23:59:60	+	S
- 
--# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
-+#      INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
- #
- # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
- #
- # SERVICE DE LA ROTATION TERRESTRE
- # OBSERVATOIRE DE PARIS
- # 61, Av. de l'Observatoire 75014 PARIS (France)
--# Tel.      : 33 (0) 1 40 51 22 29
-+# Tel.      : 33 (0) 1 40 51 22 26
- # FAX       : 33 (0) 1 40 51 22 91
--# Internet  : services.iers@obspm.fr
-+# e-mail    : services.iers@obspm.fr
-+# http://hpiers.obspm.fr/eop-pc
- #
--# Paris, 2 February 2011
-+#                                               Paris, 5 January 2012
- #
--# Bulletin C 41
-+#                                               Bulletin C 43
- #
--# To authorities responsible
--# for the measurement and
--# distribution of time
-+#                                               To authorities responsible
-+#                                               for the measurement and
-+#                                               distribution of time
- #
--# INFORMATION ON UTC - TAI
- #
--# NO positive leap second will be introduced at the end of June 2011.
--# The difference between Coordinated Universal Time UTC and the
--# International Atomic Time TAI is :		
-+#                                    UTC TIME STEP
-+#                             on the 1st of July 2012
- #
--# from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
- #
--# Leap seconds can be introduced in UTC at the end of the months of December
--# or June,  depending on the evolution of UT1-TAI. Bulletin C is mailed every
--# six months, either to announce a time step in UTC, or to confirm that there
--# will be no time step at the next possible date.
-+#  A positive leap second will be introduced at the end of June 2012.
-+#  The sequence of dates of the UTC second markers will be:
- #
--# Daniel GAMBIS
--# Head			
--# Earth Orientation Center of the IERS
--# Observatoire de Paris, France
-+#                           2012 June 30,     23h 59m 59s
-+#                           2012 June 30,     23h 59m 60s
-+#                           2012 July  1,      0h  0m  0s
-+#
-+#  The difference between UTC and the International Atomic Time TAI is:
-+#
-+#   from 2009 January 1, 0h UTC, to 2012 July 1  0h UTC  : UTC-TAI = - 34s
-+#   from 2012 July 1,    0h UTC, until further notice    : UTC-TAI = - 35s
-+#
-+#  Leap seconds can be introduced in UTC at the end of the months of December
-+#  or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
-+#  six months, either to announce a time step in UTC or to confirm that there
-+#  will be no time step at the next possible date.
-+#
-+#
-+#
-+#                                               Daniel GAMBIS
-+#                                               Head
-+#                                               Earth Orientation Center of IERS
-+#                                               Observatoire de Paris, France
diff --git a/tzdata.spec b/tzdata.spec
index 9677d08..ec1d4ef 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011n
-%define tzdata_version 2011n
-%define tzcode_version 2011i
-Release: 4%{?dist}
+Version: 2012b
+%define tzdata_version 2012b
+%define tzcode_version 2012b
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -17,8 +17,6 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://munnari.oz.au/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://munnari.oz.au/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch0: tzdata-2011n-leapsec.patch
-Patch1: tzdata-2011n-chile.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,8 +53,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 
 pushd tzdata%{tzdata_version}
 # __apply_patches
-%patch0 -p0
-%patch1 -p0
 # __end
 popd
 
@@ -120,6 +116,16 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Mar  6 2012 Petr Machata  - 2012b-1
+- Rebase to 2012b; changes vs. 2011n-4:
+  - Changes to zones for Antarctica stations
+  - Armenia abolished DST in 2012 and forward
+  - Cuba enters DST on 31st March
+  - Falkland Islands will stay on permanent Summer Time
+  - New zone for Creston Valley, Canada, which differs from Dawson
+    Creek in past stamps.  Changes to historical stamps in Canada.
+  - Last year, Tokelau skipped over the date line together with Samoa
+
 * Fri Feb 24 2012 Petr Machata  - 2011n-4
 - Add a patch for change in Chilean DST
 - Update URLs

From 73d3e379df6280cbb81e6036602499db6b8693e9 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Thu, 15 Mar 2012 17:12:29 +0100
Subject: [PATCH 166/280] Add Morocco patch

---
 tzdata-2012b-morocco.patch | 59 ++++++++++++++++++++++++++++++++++++++
 tzdata.spec                | 10 ++++++-
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2012b-morocco.patch

diff --git a/tzdata-2012b-morocco.patch b/tzdata-2012b-morocco.patch
new file mode 100644
index 0000000..8fac927
--- /dev/null
+++ b/tzdata-2012b-morocco.patch
@@ -0,0 +1,59 @@
+*** 8.33/africa	2012-03-10 09:02:05.351276500 -0500
+--- 8.34/africa	2012-03-10 09:02:13.342294400 -0500
+***************
+*** 1,5 ****
+  # 
    +! # @(#)africa	8.33
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
    +! # @(#)africa	8.34
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 768,773 ****
+--- 768,796 ----
+  # wall clock time (i.e. 11pm UTC), but that's what I would assume. It has
+  # also been like that in the past.
+  
++ # From Alexander Krivenyshev (2012-03-09):
++ # According to Infomédiaire web site from Morocco (infomediaire.ma),
++ # on March 9, 2012, (in French) Heure légale:
++ # Le Maroc adopte officiellement l'heure d'été
++ # 
++ # http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
++ # 
++ # Governing Council adopted draft decree, that Morocco DST starts on
++ # the last Sunday of March (March 25, 2012) and ends on
++ # last Sunday of September (September 30, 2012)
++ # except the month of Ramadan.
++ # or (brief)
++ # 
++ # http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
++ # 
++ 
++ # From Arthur David Olson (2012-03-10):
++ # The infomediaire.ma source indicates that the system is to be in
++ # effect every year. It gives 03H00 as the "fall back" time of day;
++ # it lacks a "spring forward" time of day; assume 2:00 XXX.
++ # Wait on specifying the Ramadan exception for details about
++ # start date, start time of day, end date, and end time of day XXX.
++ 
+  # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+  
+  Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
+***************
+*** 793,798 ****
+--- 816,824 ----
+  Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
+  Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
+  Rule	Morocco	2011	only	-	Jul	 31	 0	0	-
++ Rule	Morocco	2012	max	-	Mar	 lastSun 2:00	1:00	S
++ Rule	Morocco	2012	max	-	Sep	 lastSun 3:00	0	-
++ 
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+  Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
+  			 0:00	Morocco	WE%sT	1984 Mar 16
diff --git a/tzdata.spec b/tzdata.spec
index fe013a0..1b351ac 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2012b
 %define tzdata_version 2012b
 %define tzcode_version 2012b
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -17,6 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://munnari.oz.au/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://munnari.oz.au/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
+Patch1: tzdata-2012b-morocco.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +54,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 
 pushd tzdata%{tzdata_version}
 # __apply_patches
+%patch1 -p1
 # __end
 popd
 
@@ -116,6 +118,12 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Mar 15 2012 Petr Machata  - 2012b-2
+- Morocco DST starts on the last Sunday of March (March 25, 2012) and
+  ends on last Sunday of September, except the month of Ramadan.  It
+  is currently unclear what that Ramadan bit means, so this is not
+  covered by the patch as of now.
+
 * Tue Mar  6 2012 Petr Machata  - 2012b-1
 - Rebase to 2012b; changes vs. 2011n-5:
   - Changes to zones for Antarctica stations

From 14b4c0ccba3ae4684dd48f274b156ef5567e9f1d Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 16 Mar 2012 19:34:33 +0100
Subject: [PATCH 167/280] Morocco moved DST entry to last Sunday of April

---
 tzdata-2012b-morocco.patch | 2 +-
 tzdata.spec                | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tzdata-2012b-morocco.patch b/tzdata-2012b-morocco.patch
index 8fac927..12379cb 100644
--- a/tzdata-2012b-morocco.patch
+++ b/tzdata-2012b-morocco.patch
@@ -51,7 +51,7 @@
   Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
   Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
   Rule	Morocco	2011	only	-	Jul	 31	 0	0	-
-+ Rule	Morocco	2012	max	-	Mar	 lastSun 2:00	1:00	S
++ Rule	Morocco	2012	max	-	Apr	 lastSun 2:00	1:00	S
 + Rule	Morocco	2012	max	-	Sep	 lastSun 3:00	0	-
 + 
   # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
diff --git a/tzdata.spec b/tzdata.spec
index 1b351ac..6891383 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2012b
 %define tzdata_version 2012b
 %define tzcode_version 2012b
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -118,6 +118,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Fri Mar 16 2012 Petr Machata  - 2012b-3
+- Morocco moved DST entry to last Sunday of April
+
 * Thu Mar 15 2012 Petr Machata  - 2012b-2
 - Morocco DST starts on the last Sunday of March (March 25, 2012) and
   ends on last Sunday of September, except the month of Ramadan.  It

From 727c767513cd0225b11a0990b1d1d31936a17d0c Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 2 Apr 2012 19:21:11 +0200
Subject: [PATCH 168/280] Upstream 2012c

---
 .gitignore  |  1 +
 sources     |  2 +-
 tzdata.spec | 14 +++++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d6b2c3..4070452 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ noarch/
 /tzdata2011n.tar.gz
 /tzdata2012b.tar.gz
 /tzcode2012b.tar.gz
+/tzdata2012c.tar.gz
diff --git a/sources b/sources
index ffecb40..cc80aaa 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-0615fd29def380a917e528433c820368  tzdata2012b.tar.gz
 6137322ffd36e1fd5128885be1c57008  tzcode2012b.tar.gz
+cfdc2710bd05c26dbd624441d57028f6  tzdata2012c.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 6891383..b691156 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2012b
-%define tzdata_version 2012b
+Version: 2012c
+%define tzdata_version 2012c
 %define tzcode_version 2012b
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -17,7 +17,6 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://munnari.oz.au/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://munnari.oz.au/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2012b-morocco.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,7 +53,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 
 pushd tzdata%{tzdata_version}
 # __apply_patches
-%patch1 -p1
 # __end
 popd
 
@@ -118,6 +116,12 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Apr  2 2012 Petr Machata  - 2012c-1
+- Upstream 2012c
+  - Haiti observes DST from 2012 on
+  - Gaza Strip and Hebron observe DST in 2012
+  - Change start of DST in Syria to last Friday in March
+
 * Fri Mar 16 2012 Petr Machata  - 2012b-3
 - Morocco moved DST entry to last Sunday of April
 

From 7750bca9f27764fd131c839168e3d318c3909a40 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 2 Apr 2012 19:25:53 +0200
Subject: [PATCH 169/280] Drop morocco patch

---
 tzdata-2012b-morocco.patch | 59 --------------------------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 tzdata-2012b-morocco.patch

diff --git a/tzdata-2012b-morocco.patch b/tzdata-2012b-morocco.patch
deleted file mode 100644
index 12379cb..0000000
--- a/tzdata-2012b-morocco.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-*** 8.33/africa	2012-03-10 09:02:05.351276500 -0500
---- 8.34/africa	2012-03-10 09:02:13.342294400 -0500
-***************
-*** 1,5 ****
-  # 
    -! # @(#)africa	8.33
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)africa	8.34
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 768,773 ****
---- 768,796 ----
-  # wall clock time (i.e. 11pm UTC), but that's what I would assume. It has
-  # also been like that in the past.
-  
-+ # From Alexander Krivenyshev (2012-03-09):
-+ # According to Infomédiaire web site from Morocco (infomediaire.ma),
-+ # on March 9, 2012, (in French) Heure légale:
-+ # Le Maroc adopte officiellement l'heure d'été
-+ # 
-+ # http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
-+ # 
-+ # Governing Council adopted draft decree, that Morocco DST starts on
-+ # the last Sunday of March (March 25, 2012) and ends on
-+ # last Sunday of September (September 30, 2012)
-+ # except the month of Ramadan.
-+ # or (brief)
-+ # 
-+ # http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
-+ # 
-+ 
-+ # From Arthur David Olson (2012-03-10):
-+ # The infomediaire.ma source indicates that the system is to be in
-+ # effect every year. It gives 03H00 as the "fall back" time of day;
-+ # it lacks a "spring forward" time of day; assume 2:00 XXX.
-+ # Wait on specifying the Ramadan exception for details about
-+ # start date, start time of day, end date, and end time of day XXX.
-+ 
-  # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-  
-  Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
-***************
-*** 793,798 ****
---- 816,824 ----
-  Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
-  Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
-  Rule	Morocco	2011	only	-	Jul	 31	 0	0	-
-+ Rule	Morocco	2012	max	-	Apr	 lastSun 2:00	1:00	S
-+ Rule	Morocco	2012	max	-	Sep	 lastSun 3:00	0	-
-+ 
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
-  			 0:00	Morocco	WE%sT	1984 Mar 16

From 6e077e5b7576aeb1ff362a27d1370879481cf595 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 13 Jul 2012 12:29:02 +0200
Subject: [PATCH 170/280] Morocco will not observe DST during the month of
 Ramadan

changed zones:
  Africa/Casablanca
     Introduced WEST (UTC+1, dst) 19th Aug 2012 02:00:00
     Introduced WET (UTC, std) 20th Jul 2012 02:00:00
---
 tzdata-2012c-morocco.patch | 15 +++++++++++++++
 tzdata.spec                |  8 +++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2012c-morocco.patch

diff --git a/tzdata-2012c-morocco.patch b/tzdata-2012c-morocco.patch
new file mode 100644
index 0000000..42c836e
--- /dev/null
+++ b/tzdata-2012c-morocco.patch
@@ -0,0 +1,15 @@
+diff -up africa\~ africa
+--- africa~	2012-03-27 17:39:16.000000000 +0200
++++ africa	2012-07-13 09:46:30.382276596 +0200
+@@ -826,6 +826,9 @@ Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:
+ Rule	Morocco	2011	only	-	Jul	 31	 0	0	-
+ Rule	Morocco	2012	max	-	Apr	 lastSun 2:00	1:00	S
+ Rule	Morocco	2012	max	-	Sep	 lastSun 3:00	0	-
++# DST is suspended for the month of Ramadan
++Rule	Morocco 2012	only	-	Jul	 20	 3:00	0	-
++Rule	Morocco 2012	only	-	Aug	 19	 2:00	1:00	S
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
+
+Diff finished.  Fri Jul 13 09:46:38 2012
diff --git a/tzdata.spec b/tzdata.spec
index b691156..95edcd0 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2012c
 %define tzdata_version 2012c
 %define tzcode_version 2012b
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -17,6 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://munnari.oz.au/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://munnari.oz.au/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
+Patch1: tzdata-2012c-morocco.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +54,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 
 pushd tzdata%{tzdata_version}
 # __apply_patches
+%patch1
 # __end
 popd
 
@@ -116,6 +118,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Fri Jul 13 2012 Petr Machata  - 2012c-2
+- Morocco will not observe DST during the month of Ramadan
+  (tzdata-2012c-morocco.patch)
+
 * Mon Apr  2 2012 Petr Machata  - 2012c-1
 - Upstream 2012c
   - Haiti observes DST from 2012 on

From 18b466134f7f407eac1e769348e0c1d9e80a9773 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 20 Jul 2012 16:04:49 +0200
Subject: [PATCH 171/280] Upstream 2012d

changed zones (vs. 2012c-2)
  Africa/Casablanca
     Moved WEST (UTC+1, dst) from 19th Aug 2012 02:00:00 to 20th
---
 .gitignore                 |  2 ++
 sources                    |  4 ++--
 tzdata-2012c-morocco.patch | 15 ---------------
 tzdata.spec                | 15 +++++++++------
 4 files changed, 13 insertions(+), 23 deletions(-)
 delete mode 100644 tzdata-2012c-morocco.patch

diff --git a/.gitignore b/.gitignore
index 4070452..e8c1e2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,5 @@ noarch/
 /tzdata2012b.tar.gz
 /tzcode2012b.tar.gz
 /tzdata2012c.tar.gz
+/tzcode2012c.tar.gz
+/tzdata2012d.tar.gz
diff --git a/sources b/sources
index cc80aaa..3a646b8 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-6137322ffd36e1fd5128885be1c57008  tzcode2012b.tar.gz
-cfdc2710bd05c26dbd624441d57028f6  tzdata2012c.tar.gz
+f0873d819e886ecc0b116f5f086e23d1  tzcode2012c.tar.gz
+fc0f54b76054800394f8c366ea1eeea7  tzdata2012d.tar.gz
diff --git a/tzdata-2012c-morocco.patch b/tzdata-2012c-morocco.patch
deleted file mode 100644
index 42c836e..0000000
--- a/tzdata-2012c-morocco.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up africa\~ africa
---- africa~	2012-03-27 17:39:16.000000000 +0200
-+++ africa	2012-07-13 09:46:30.382276596 +0200
-@@ -826,6 +826,9 @@ Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:
- Rule	Morocco	2011	only	-	Jul	 31	 0	0	-
- Rule	Morocco	2012	max	-	Apr	 lastSun 2:00	1:00	S
- Rule	Morocco	2012	max	-	Sep	 lastSun 3:00	0	-
-+# DST is suspended for the month of Ramadan
-+Rule	Morocco 2012	only	-	Jul	 20	 3:00	0	-
-+Rule	Morocco 2012	only	-	Aug	 19	 2:00	1:00	S
- 
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
-
-Diff finished.  Fri Jul 13 09:46:38 2012
diff --git a/tzdata.spec b/tzdata.spec
index 95edcd0..8dc97f8 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2012c
-%define tzdata_version 2012c
-%define tzcode_version 2012b
-Release: 2%{?dist}
+Version: 2012d
+%define tzdata_version 2012d
+%define tzcode_version 2012c
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -17,7 +17,6 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://munnari.oz.au/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://munnari.oz.au/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2012c-morocco.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,7 +53,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 
 pushd tzdata%{tzdata_version}
 # __apply_patches
-%patch1
 # __end
 popd
 
@@ -118,6 +116,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Fri Jul 20 2012 Petr Machata  - 2012d-1
+- Upstream 2012d
+  - Morocco will not observe DST during the month of Ramadan.
+    DST cessation end date was corrected.
+
 * Fri Jul 13 2012 Petr Machata  - 2012c-2
 - Morocco will not observe DST during the month of Ramadan
   (tzdata-2012c-morocco.patch)

From 39d3c0ba282373ddfdd3cd9a37b3606ec147f683 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 13 Aug 2012 13:39:45 +0200
Subject: [PATCH 172/280] Tokelau is in time zone UTC+13, not UTC+14 (and
 always was)

changed zones:
  Pacific/Fakaofo
     Dropped TKT (UTC-10, std) 1st Jan 1901 11:24:56
     Introduced TKT (UTC-11, std) 1st Jan 1901 11:24:56
     Dropped TKT (UTC+14, std) 30th Dec 2011 10:00
     Introduced TKT (UTC+13, std) 30th Dec 2011 11:00
     Moved TKT-14 to TKT-13: after last transition
---
 .gitignore  | 2 ++
 sources     | 4 ++--
 tzdata.spec | 9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e8c1e2d..59528ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,5 @@ noarch/
 /tzdata2012c.tar.gz
 /tzcode2012c.tar.gz
 /tzdata2012d.tar.gz
+/tzdata2012e.tar.gz
+/tzcode2012e.tar.gz
diff --git a/sources b/sources
index 3a646b8..97120aa 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-f0873d819e886ecc0b116f5f086e23d1  tzcode2012c.tar.gz
-fc0f54b76054800394f8c366ea1eeea7  tzdata2012d.tar.gz
+cb74e1f7bcc9a968a891a471e72e47b8  tzdata2012e.tar.gz
+cc56398842289807a80791f1f654181f  tzcode2012e.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 8dc97f8..f2fb425 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2012d
-%define tzdata_version 2012d
-%define tzcode_version 2012c
+Version: 2012e
+%define tzdata_version 2012e
+%define tzcode_version 2012e
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -116,6 +116,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Aug 13 2012 Petr Machata  - 2012e-1
+- Tokelau is in time zone UTC+13, not UTC+14 (and always was)
+
 * Fri Jul 20 2012 Petr Machata  - 2012d-1
 - Upstream 2012d
   - Morocco will not observe DST during the month of Ramadan.

From b63eda6b986ca4e14e5d1e25e7f3a7dd25a71059 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 17 Sep 2012 14:25:18 +0200
Subject: [PATCH 173/280] Upstream 2012f

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 12 +++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 59528ce..862625f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,5 @@ noarch/
 /tzdata2012d.tar.gz
 /tzdata2012e.tar.gz
 /tzcode2012e.tar.gz
+/tzdata2012f.tar.gz
+/tzcode2012f.tar.gz
diff --git a/sources b/sources
index 97120aa..6be152d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-cb74e1f7bcc9a968a891a471e72e47b8  tzdata2012e.tar.gz
-cc56398842289807a80791f1f654181f  tzcode2012e.tar.gz
+944ad681a8623336230dcdb306d5c9f6  tzdata2012f.tar.gz
+edc0b55c4afbad7249ccacb3503e7f10  tzcode2012f.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index f2fb425..1194b1a 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2012e
-%define tzdata_version 2012e
-%define tzcode_version 2012e
+Version: 2012f
+%define tzdata_version 2012f
+%define tzcode_version 2012f
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -116,6 +116,12 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Sep 17 2012 Petr Machata  - 2012f-1
+- Fiji will start daylight savings at 2 am on Sunday 21st October 2012
+  and end at 3 am on Sunday 20th January 2013.  Guess it will be like
+  that in following years as well.
+- Resolves: #857231
+
 * Mon Aug 13 2012 Petr Machata  - 2012e-1
 - Tokelau is in time zone UTC+13, not UTC+14 (and always was)
 

From 13e618327d0362e5bce35b75d4901655dc8ffbbf Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 15 Oct 2012 12:16:14 +0200
Subject: [PATCH 174/280] Update URLs now that IANA took care of maintaining
 zoneinfo

---
 tzdata.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tzdata.spec b/tzdata.spec
index 1194b1a..e90088d 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -6,7 +6,7 @@ Version: 2012f
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
-URL: ftp://munnari.oz.au/pub/
+URL: https://www.iana.org/time-zones
 
 # The tzdata-base-0.tar.bz2 is a simple building infrastructure and
 # a test suite.  It is occasionally updated from glibc sources, and as
@@ -14,8 +14,8 @@ URL: ftp://munnari.oz.au/pub/
 # final zoneinfo files.
 Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
-Source1: ftp://munnari.oz.au/pub/tzdata%{tzdata_version}.tar.gz
-Source2: ftp://munnari.oz.au/pub/tzcode%{tzcode_version}.tar.gz
+Source1: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
+Source2: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 # __end
 

From e3aca5e1de23ed569754833015e780d8a843b54b Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 22 Oct 2012 21:18:48 +0200
Subject: [PATCH 175/280] Upstream 2012g

---
 .gitignore  |  3 +++
 sources     |  5 ++--
 tzdata.spec | 74 ++++++++++++++++++++++++-----------------------------
 3 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index 862625f..3f6d858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ tzdata2010l.tar.gz
 /tzdata2011b.tar.gz
 /tzcode2011b.tar.gz
 tzdata/
+/tzdata-*/
 *.rpm
 /tzdata2011d.tar.gz
 /tzcode2011d.tar.gz
@@ -78,3 +79,5 @@ noarch/
 /tzcode2012e.tar.gz
 /tzdata2012f.tar.gz
 /tzcode2012f.tar.gz
+/tzdata2012g.tar.gz
+/tzcode2012g.tar.gz
diff --git a/sources b/sources
index 6be152d..6eb3a99 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-944ad681a8623336230dcdb306d5c9f6  tzdata2012f.tar.gz
-edc0b55c4afbad7249ccacb3503e7f10  tzcode2012f.tar.gz
+111cd46b5c2e40b2b37ae707d48aaa50  tzdata2012g.tar.gz
+fe614c3cb5fd6418e2e65254aa46bb72  tzcode2012g.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index e90088d..3aed30b 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,21 +1,14 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2012f
-%define tzdata_version 2012f
-%define tzcode_version 2012f
+Version: 2012g
+%define tzdata_version 2012g
+%define tzcode_version 2012g
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
-
-# The tzdata-base-0.tar.bz2 is a simple building infrastructure and
-# a test suite.  It is occasionally updated from glibc sources, and as
-# such is under LGPLv2+, but none of this ever gets to be part of
-# final zoneinfo files.
-Source0: tzdata-base-0.tar.bz2
-# These are official upstream.
-Source1: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
-Source2: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
+Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
+Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 # __end
 
@@ -42,19 +35,10 @@ This package contains timezone information for use by Java runtimes.
 
 
 %prep
-%setup -q -n tzdata
-mkdir tzdata%{tzdata_version}
-tar xzf %{SOURCE1} -C tzdata%{tzdata_version}
-mkdir tzcode%{tzcode_version}
-tar xzf %{SOURCE2} -C tzcode%{tzcode_version}
-sed -e 's|@objpfx@|'`pwd`'/obj/|' \
-    -e 's|@datadir@|%{_datadir}|' \
-  Makeconfig.in > Makeconfig
+%setup -q -c -a 1
 
-pushd tzdata%{tzdata_version}
 # __apply_patches
 # __end
-popd
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -75,47 +59,55 @@ find . -type f -name '*.java' -print0 \
 popd
 
 %build
-make
-grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version}/tz-link.html
+make TOPDIR=$RPM_BUILD_ROOT/usr \
+     TZDIR=$RPM_BUILD_ROOT/usr/share/zoneinfo \
+     all
+grep -v tz-art.htm tz-link.htm > tz-link.html
 
 pushd javazic
 javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
 popd
-pushd tzdata%{tzdata_version}
-java -classpath ../javazic/ rht.tools.javazic.Main -V %{version} \
-  -d ../zoneinfo/java \
+
+java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
+  -d zoneinfo/java \
   africa antarctica asia australasia europe northamerica pacificnew \
   southamerica backward etcetera solar87 solar88 solar89 systemv \
-  ../javazic/tzdata_jdk/gmt ../javazic/tzdata_jdk/jdk11_backward
-popd
+  javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
 
 %install
 rm -fr $RPM_BUILD_ROOT
-sed -i 's|@install_root@|%{buildroot}|' Makeconfig
-make install
-
+make TOPDIR=$RPM_BUILD_ROOT/usr \
+     TZDIR=$RPM_BUILD_ROOT/usr/share/zoneinfo \
+     install
+mv $RPM_BUILD_ROOT/usr/share/zoneinfo-posix $RPM_BUILD_ROOT/usr/share/zoneinfo/posix
+mv $RPM_BUILD_ROOT/usr/share/zoneinfo-leaps $RPM_BUILD_ROOT/usr/share/zoneinfo/right
+rm -f $RPM_BUILD_ROOT/usr/share/zoneinfo/localtime
+rm -Rf $RPM_BUILD_ROOT/usr/{etc,lib,man}
 cp -pr zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi
 
-%check
-echo ====================TESTING=========================
-make check
-echo ====================TESTING END=====================
-
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
 %{_datadir}/zoneinfo
-%doc tzcode%{tzcode_version}/README
-%doc tzcode%{tzcode_version}/Theory
-%doc tzcode%{tzcode_version}/tz-link.html
+%doc README
+%doc Theory
+%doc tz-link.html
 
 %files java
 %defattr(-,root,root)
 %{_datadir}/javazi
 
 %changelog
+* Mon Oct 22 2012 Petr Machata  - 2012g-1
+- Upstream 2012g
+  - Adjust the packaging for new Makefile
+  - Palestine: Fall transition was Sep 21, not Sep 28
+  - Samoa: Daylight Saving Time commences on Sunday 30th September
+    2012 and ends on Sunday 7th of April 2013.
+- Resolves: #868173
+
 * Mon Sep 17 2012 Petr Machata  - 2012f-1
 - Fiji will start daylight savings at 2 am on Sunday 21st October 2012
   and end at 3 am on Sunday 20th January 2013.  Guess it will be like

From d0ea9fcb8df4239ccb61f00ffc81db55c8945dc5 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Thu, 1 Nov 2012 00:12:50 +0100
Subject: [PATCH 176/280] Upstream 2012h

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 13 ++++++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f6d858..cdc5995 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,5 @@ noarch/
 /tzcode2012f.tar.gz
 /tzdata2012g.tar.gz
 /tzcode2012g.tar.gz
+/tzdata2012h.tar.gz
+/tzcode2012h.tar.gz
diff --git a/sources b/sources
index 6eb3a99..9b7beb7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-111cd46b5c2e40b2b37ae707d48aaa50  tzdata2012g.tar.gz
-fe614c3cb5fd6418e2e65254aa46bb72  tzcode2012g.tar.gz
+b937335e087fb85b7f8e3ce33e69184b  tzdata2012h.tar.gz
+44b3b6c3e50240ac44f16437040a7ba2  tzcode2012h.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 3aed30b..1061746 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2012g
-%define tzdata_version 2012g
-%define tzcode_version 2012g
+Version: 2012h
+%define tzdata_version 2012h
+%define tzcode_version 2012h
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -100,6 +100,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Wed Oct 31 2012 Petr Machata  - 2012h-1
+- Upstream 2012h
+  - Brazilian state Bahia no longer has DST.
+  - Brazilian state Tocantins now has DST.
+  - Israel has new DST rules next year.
+  - Jordan stays on DST this winter.
+
 * Mon Oct 22 2012 Petr Machata  - 2012g-1
 - Upstream 2012g
   - Adjust the packaging for new Makefile

From 8bac75d575c67ca223ce8875317d989023d7e934 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 5 Nov 2012 21:25:39 +0100
Subject: [PATCH 177/280] Switch back to using system zic

---
 tzdata.spec | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/tzdata.spec b/tzdata.spec
index 1061746..fe92cec 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2012h
 %define tzdata_version 2012h
 %define tzcode_version 2012h
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -33,7 +33,6 @@ Patch101: javazic-exclusion-fix.patch
 %description java
 This package contains timezone information for use by Java runtimes.
 
-
 %prep
 %setup -q -c -a 1
 
@@ -59,9 +58,14 @@ find . -type f -name '*.java' -print0 \
 popd
 
 %build
-make TOPDIR=$RPM_BUILD_ROOT/usr \
-     TZDIR=$RPM_BUILD_ROOT/usr/share/zoneinfo \
-     all
+FILES="africa antarctica asia australasia europe northamerica southamerica
+	pacificnew etcetera backward solar87 solar88 solar89"
+
+mkdir zoneinfo/{,posix,right}
+zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
+zic -y ./yearistype -d zoneinfo/posix -L /dev/null $FILES
+zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
+
 grep -v tz-art.htm tz-link.htm > tz-link.html
 
 pushd javazic
@@ -69,21 +73,15 @@ javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
 popd
 
 java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
-  -d zoneinfo/java \
-  africa antarctica asia australasia europe northamerica pacificnew \
-  southamerica backward etcetera solar87 solar88 solar89 systemv \
-  javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
+  -d javazi \
+  $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
 
 %install
 rm -fr $RPM_BUILD_ROOT
-make TOPDIR=$RPM_BUILD_ROOT/usr \
-     TZDIR=$RPM_BUILD_ROOT/usr/share/zoneinfo \
-     install
-mv $RPM_BUILD_ROOT/usr/share/zoneinfo-posix $RPM_BUILD_ROOT/usr/share/zoneinfo/posix
-mv $RPM_BUILD_ROOT/usr/share/zoneinfo-leaps $RPM_BUILD_ROOT/usr/share/zoneinfo/right
-rm -f $RPM_BUILD_ROOT/usr/share/zoneinfo/localtime
-rm -Rf $RPM_BUILD_ROOT/usr/{etc,lib,man}
-cp -pr zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi
+install -d $RPM_BUILD_ROOT%{_datadir}
+cp -pr zoneinfo $RPM_BUILD_ROOT%{_datadir}
+install -p -m 644 -t $RPM_BUILD_ROOT%{_datadir}/zoneinfo zone.tab iso3166.tab
+cp -pr javazi $RPM_BUILD_ROOT%{_datadir}/javazi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,6 +98,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Mon Nov  5 2012 Petr Machata  - 2012h-2
+- Switch back to using system zic, ignore upstream Makefile at all.
+  We do so for java anyway.
+- Drop Factory from distribution
+
 * Wed Oct 31 2012 Petr Machata  - 2012h-1
 - Upstream 2012h
   - Brazilian state Bahia no longer has DST.

From bd538743d0c81585598e56489a134b9d7466c170 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 5 Nov 2012 23:44:44 +0100
Subject: [PATCH 178/280] Upstream 2012i

changed zones:
  share/zoneinfo/America/Havana
     Moved CST (UTC-5, std) from last Sun Oct 05:00 to 1st Sun Nov: 2012-2037
     Moved CST5CDT,M3.2.0/0,M10.5.0/1 to CST5CDT,M3.2.0/0,M11.1.0/1: after last transition
  share/zoneinfo/Cuba
     Moved CST (UTC-5, std) from last Sun Oct 05:00 to 1st Sun Nov: 2012-2037
     Moved CST5CDT,M3.2.0/0,M10.5.0/1 to CST5CDT,M3.2.0/0,M11.1.0/1: after last transition
---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 12 ++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index cdc5995..69eba0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,5 @@ noarch/
 /tzcode2012g.tar.gz
 /tzdata2012h.tar.gz
 /tzcode2012h.tar.gz
+/tzdata2012i.tar.gz
+/tzcode2012i.tar.gz
diff --git a/sources b/sources
index 9b7beb7..7ee99d6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-b937335e087fb85b7f8e3ce33e69184b  tzdata2012h.tar.gz
-44b3b6c3e50240ac44f16437040a7ba2  tzcode2012h.tar.gz
+feea4fc19a4c55ff7550d90741e5da3f  tzdata2012i.tar.gz
+ec4a36d949d45c9cc017b106d8772ff8  tzcode2012i.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index fe92cec..dbdb99e 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2012h
-%define tzdata_version 2012h
-%define tzcode_version 2012h
-Release: 2%{?dist}
+Version: 2012i
+%define tzdata_version 2012i
+%define tzcode_version 2012i
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -98,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Mon Nov  5 2012 Petr Machata  - 2012i-1
+- Upstream 2012i
+  - Cuba switched to DST
+
 * Mon Nov  5 2012 Petr Machata  - 2012h-2
 - Switch back to using system zic, ignore upstream Makefile at all.
   We do so for java anyway.

From d88b315f49a1d6ef44d5ad2d434b8ee0dad664c9 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 6 Nov 2012 01:52:44 +0100
Subject: [PATCH 179/280] Preserve hardlinks

---
 tzdata.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tzdata.spec b/tzdata.spec
index dbdb99e..a7610b0 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2012i
 %define tzdata_version 2012i
 %define tzcode_version 2012i
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -79,9 +79,9 @@ java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
 %install
 rm -fr $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}
-cp -pr zoneinfo $RPM_BUILD_ROOT%{_datadir}
-install -p -m 644 -t $RPM_BUILD_ROOT%{_datadir}/zoneinfo zone.tab iso3166.tab
-cp -pr javazi $RPM_BUILD_ROOT%{_datadir}/javazi
+cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir}
+install -p -m 644 zone.tab iso3166.tab $RPM_BUILD_ROOT%{_datadir}/zoneinfo
+cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Tue Nov  6 2012 Petr Machata  - 2012i-2
+- Preserve hardlinks that zic leaves behind, install with cp -d
+
 * Mon Nov  5 2012 Petr Machata  - 2012i-1
 - Upstream 2012i
   - Cuba switched to DST

From 7b21531f909325d6fd672994b0e13e3157016c52 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 30 Nov 2012 19:02:42 +0100
Subject: [PATCH 180/280] Upstream 2012j

changed zones:
  share/zoneinfo/Africa/Tripoli
     Introduced CET (UTC+1, std) 10th (2nd Sat) Nov 2012 00:00
     Introduced CET (UTC+1, std) last Fri Oct 00:00: 2013-2037
     Introduced CEST (UTC+2, dst) last Fri Mar 00:00: 2013-2037
     Moved EET-2 to CET-1CEST,M3.5.5/1,M10.5.5: after last transition
  share/zoneinfo/Libya
     Introduced CET (UTC+1, std) 10th (2nd Sat) Nov 2012 00:00
     Introduced CET (UTC+1, std) last Fri Oct 00:00: 2013-2037
     Introduced CEST (UTC+2, dst) last Fri Mar 00:00: 2013-2037
     Moved EET-2 to CET-1CEST,M3.5.5/1,M10.5.5: after last transition
---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 12 ++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 69eba0d..77324b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,5 @@ noarch/
 /tzcode2012h.tar.gz
 /tzdata2012i.tar.gz
 /tzcode2012i.tar.gz
+/tzdata2012j.tar.gz
+/tzcode2012j.tar.gz
diff --git a/sources b/sources
index 7ee99d6..6aebfa9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-feea4fc19a4c55ff7550d90741e5da3f  tzdata2012i.tar.gz
-ec4a36d949d45c9cc017b106d8772ff8  tzcode2012i.tar.gz
+ba2f92ae7ad099090e8f86cff2f2d799  tzdata2012j.tar.gz
+868b5d0dbf0e115ae4eb39a932ad0c4c  tzcode2012j.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index a7610b0..c048588 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2012i
-%define tzdata_version 2012i
-%define tzcode_version 2012i
-Release: 2%{?dist}
+Version: 2012j
+%define tzdata_version 2012j
+%define tzcode_version 2012j
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -98,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Fri Nov 30 2012 Petr Machata  - 2012j-1
+- Upstream 2012j
+  - Libya moved to CET
+
 * Tue Nov  6 2012 Petr Machata  - 2012i-2
 - Preserve hardlinks that zic leaves behind, install with cp -d
 

From 3debb947b94359eed2b7ee747cd2a1dffc548711 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore 
Date: Thu, 14 Feb 2013 20:19:06 -0600
Subject: [PATCH 181/280] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 tzdata.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index c048588..1f5c874 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2012j
 %define tzdata_version 2012j
 %define tzcode_version 2012j
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Fri Feb 15 2013 Fedora Release Engineering  - 2012j-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Fri Nov 30 2012 Petr Machata  - 2012j-1
 - Upstream 2012j
   - Libya moved to CET

From 65cfb3fa29140f032b0f16d3a9204a48d8e6b737 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 27 Feb 2013 17:45:42 +0100
Subject: [PATCH 182/280] Chile is changing DST rules

---
 0016-Chile-is-changing-its-DST-rules.patch | 70 ++++++++++++++++++++++
 tzdata.spec                                |  8 ++-
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 0016-Chile-is-changing-its-DST-rules.patch

diff --git a/0016-Chile-is-changing-its-DST-rules.patch b/0016-Chile-is-changing-its-DST-rules.patch
new file mode 100644
index 0000000..2869dc5
--- /dev/null
+++ b/0016-Chile-is-changing-its-DST-rules.patch
@@ -0,0 +1,70 @@
+From cec2e7019a42e7b154b3e78993d8716d33ca6062 Mon Sep 17 00:00:00 2001
+From: Paul Eggert 
+Date: Wed, 20 Feb 2013 23:40:23 -0800
+Subject: [PATCH 16/16] Chile is changing its DST rules.
+
+Thanks to Steffen Thorsen for the heads-up, in
+.
+* antarctica (ChileAQ):
+* southamerica (Chile):
+Assume the 2012 rules will continue indefinitely.  Suggested by Robert
+Elz in .
+---
+ antarctica   |    6 ++----
+ southamerica |   16 +++++++++-------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/antarctica b/antarctica
+index f55cbde..d55924b 100644
+--- a/antarctica
++++ b/antarctica
+@@ -50,10 +50,8 @@ Rule	ChileAQ	2009	only	-	Mar	Sun>=9	3:00u	0	-
+ Rule	ChileAQ	2010	only	-	Apr	Sun>=1	3:00u	0	-
+ Rule	ChileAQ	2011	only	-	May	Sun>=2	3:00u	0	-
+ Rule	ChileAQ	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+-Rule	ChileAQ	2012	only	-	Apr	Sun>=23	3:00u	0	-
+-Rule	ChileAQ	2012	only	-	Sep	Sun>=2	4:00u	1:00	S
+-Rule	ChileAQ	2013	max	-	Mar	Sun>=9	3:00u	0	-
+-Rule	ChileAQ	2013	max	-	Oct	Sun>=9	4:00u	1:00	S
++Rule	ChileAQ	2012	max	-	Apr	Sun>=23	3:00u	0	-
++Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
+ 
+ # These rules are stolen from the `australasia' file.
+ Rule	AusAQ	1917	only	-	Jan	 1	0:01	1:00	-
+diff --git a/southamerica b/southamerica
+index 671d09b..f77142e 100644
+--- a/southamerica
++++ b/southamerica
+@@ -1240,9 +1240,13 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
+ # b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is,
+ # at 23:59:59, instead of passing to 0:00, the time should be adjusted to be
+ # 01:00 on September 2.
+-#
+-# Note that...this is yet another "temporary" change that will be reevaluated
+-# AGAIN in 2013.
++
++# From Steffen Thorsen (2013-02-15):
++# According to several news sources, Chile has extended DST this year,
++# they will end DST later and start DST earlier than planned.  They
++# hope to save energy.  The new end date is 2013-04-28 00:00 and new
++# start date is 2013-09-08 00:00....
++# http://www.gob.cl/informa/2013/02/15/gobierno-anuncia-fechas-de-cambio-de-hora-para-el-ano-2013.htm
+ 
+ # NOTE: ChileAQ rules for Antarctic bases are stored separately in the
+ # 'antarctica' file.
+@@ -1285,10 +1289,8 @@ Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+ Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
+ Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
+ Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+-Rule	Chile	2012	only	-	Apr	Sun>=23	3:00u	0	-
+-Rule	Chile	2012	only	-	Sep	Sun>=2	4:00u	1:00	S
+-Rule	Chile	2013	max	-	Mar	Sun>=9	3:00u	0	-
+-Rule	Chile	2013	max	-	Oct	Sun>=9	4:00u	1:00	S
++Rule	Chile	2012	max	-	Apr	Sun>=23	3:00u	0	-
++Rule	Chile	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
+ # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+ # (1996-09) says 1998-03-08.  Ignore these.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-- 
+1.7.6.5
+
diff --git a/tzdata.spec b/tzdata.spec
index 1f5c874..ba07fde 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,13 +3,14 @@ Name: tzdata
 Version: 2012j
 %define tzdata_version 2012j
 %define tzcode_version 2012j
-Release: 2%{?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
 # __decl_patches
+Patch0: 0016-Chile-is-changing-its-DST-rules.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +38,7 @@ This package contains timezone information for use by Java runtimes.
 %setup -q -c -a 1
 
 # __apply_patches
+%patch0 -p1
 # __end
 
 mkdir javazic
@@ -98,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Wed Feb 27 2013 Petr Machata  - 2012j-3
+- DTS in Chile will end on 2013-04-28
+  (0016-Chile-is-changing-its-DST-rules.patch)
+
 * Fri Feb 15 2013 Fedora Release Engineering  - 2012j-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

From 6b4b305dbfc716a3093eed03b6c2451382350974 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 13 Mar 2013 16:24:33 +0100
Subject: [PATCH 183/280] Upstream 2013b

---
 .gitignore                                 |  2 +
 0016-Chile-is-changing-its-DST-rules.patch | 70 ----------------------
 sources                                    |  4 +-
 tzdata.spec                                | 20 +++++--
 4 files changed, 18 insertions(+), 78 deletions(-)
 delete mode 100644 0016-Chile-is-changing-its-DST-rules.patch

diff --git a/.gitignore b/.gitignore
index 77324b4..3787200 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,5 @@ noarch/
 /tzcode2012i.tar.gz
 /tzdata2012j.tar.gz
 /tzcode2012j.tar.gz
+/tzdata2013b.tar.gz
+/tzcode2013b.tar.gz
diff --git a/0016-Chile-is-changing-its-DST-rules.patch b/0016-Chile-is-changing-its-DST-rules.patch
deleted file mode 100644
index 2869dc5..0000000
--- a/0016-Chile-is-changing-its-DST-rules.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From cec2e7019a42e7b154b3e78993d8716d33ca6062 Mon Sep 17 00:00:00 2001
-From: Paul Eggert 
-Date: Wed, 20 Feb 2013 23:40:23 -0800
-Subject: [PATCH 16/16] Chile is changing its DST rules.
-
-Thanks to Steffen Thorsen for the heads-up, in
-.
-* antarctica (ChileAQ):
-* southamerica (Chile):
-Assume the 2012 rules will continue indefinitely.  Suggested by Robert
-Elz in .
----
- antarctica   |    6 ++----
- southamerica |   16 +++++++++-------
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/antarctica b/antarctica
-index f55cbde..d55924b 100644
---- a/antarctica
-+++ b/antarctica
-@@ -50,10 +50,8 @@ Rule	ChileAQ	2009	only	-	Mar	Sun>=9	3:00u	0	-
- Rule	ChileAQ	2010	only	-	Apr	Sun>=1	3:00u	0	-
- Rule	ChileAQ	2011	only	-	May	Sun>=2	3:00u	0	-
- Rule	ChileAQ	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
--Rule	ChileAQ	2012	only	-	Apr	Sun>=23	3:00u	0	-
--Rule	ChileAQ	2012	only	-	Sep	Sun>=2	4:00u	1:00	S
--Rule	ChileAQ	2013	max	-	Mar	Sun>=9	3:00u	0	-
--Rule	ChileAQ	2013	max	-	Oct	Sun>=9	4:00u	1:00	S
-+Rule	ChileAQ	2012	max	-	Apr	Sun>=23	3:00u	0	-
-+Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
- 
- # These rules are stolen from the `australasia' file.
- Rule	AusAQ	1917	only	-	Jan	 1	0:01	1:00	-
-diff --git a/southamerica b/southamerica
-index 671d09b..f77142e 100644
---- a/southamerica
-+++ b/southamerica
-@@ -1240,9 +1240,13 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
- # b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is,
- # at 23:59:59, instead of passing to 0:00, the time should be adjusted to be
- # 01:00 on September 2.
--#
--# Note that...this is yet another "temporary" change that will be reevaluated
--# AGAIN in 2013.
-+
-+# From Steffen Thorsen (2013-02-15):
-+# According to several news sources, Chile has extended DST this year,
-+# they will end DST later and start DST earlier than planned.  They
-+# hope to save energy.  The new end date is 2013-04-28 00:00 and new
-+# start date is 2013-09-08 00:00....
-+# http://www.gob.cl/informa/2013/02/15/gobierno-anuncia-fechas-de-cambio-de-hora-para-el-ano-2013.htm
- 
- # NOTE: ChileAQ rules for Antarctic bases are stored separately in the
- # 'antarctica' file.
-@@ -1285,10 +1289,8 @@ Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
- Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
- Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
- Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
--Rule	Chile	2012	only	-	Apr	Sun>=23	3:00u	0	-
--Rule	Chile	2012	only	-	Sep	Sun>=2	4:00u	1:00	S
--Rule	Chile	2013	max	-	Mar	Sun>=9	3:00u	0	-
--Rule	Chile	2013	max	-	Oct	Sun>=9	4:00u	1:00	S
-+Rule	Chile	2012	max	-	Apr	Sun>=23	3:00u	0	-
-+Rule	Chile	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
- # IATA SSIM anomalies: (1992-02) says 1992-03-14;
- # (1996-09) says 1998-03-08.  Ignore these.
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
--- 
-1.7.6.5
-
diff --git a/sources b/sources
index 6aebfa9..4783f42 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-ba2f92ae7ad099090e8f86cff2f2d799  tzdata2012j.tar.gz
-868b5d0dbf0e115ae4eb39a932ad0c4c  tzcode2012j.tar.gz
+489dbca77d1f2e287a3987ca047bb246  tzdata2013b.tar.gz
+c8bb91ce60092ef61d628d104ad3dab1  tzcode2013b.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index ba07fde..a6387a5 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,16 +1,15 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2012j
-%define tzdata_version 2012j
-%define tzcode_version 2012j
-Release: 3%{?dist}
+Version: 2013b
+%define tzdata_version 2013b
+%define tzcode_version 2013b
+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
 # __decl_patches
-Patch0: 0016-Chile-is-changing-its-DST-rules.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +37,6 @@ This package contains timezone information for use by Java runtimes.
 %setup -q -c -a 1
 
 # __apply_patches
-%patch0 -p1
 # __end
 
 mkdir javazic
@@ -100,6 +98,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Wed Mar 13 2013 Petr Machata  - 2013b-1
+- Upstream 2013b
+  - Paraguay will end DST on March 24 this year
+  - Haiti uses US daylight-saving rules this year
+  - Morocco does not observe DST during Ramadan
+- Upstream 2013a
+  - Retire Chile patch, 2013a has the data
+  - New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen
+  - Many changes in historical timestamps
+
 * Wed Feb 27 2013 Petr Machata  - 2012j-3
 - DTS in Chile will end on 2013-04-28
   (0016-Chile-is-changing-its-DST-rules.patch)

From 3d9c1be0cdf298f8a3622b0678ce42d37a528720 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 27 Mar 2013 20:02:23 +0100
Subject: [PATCH 184/280] Palestine starts Daylight Saving Time on March 29,
 2013

---
 tzdata-2013b-gaza.patch | 92 +++++++++++++++++++++++++++++++++++++++++
 tzdata.spec             | 13 +++---
 2 files changed, 99 insertions(+), 6 deletions(-)
 create mode 100644 tzdata-2013b-gaza.patch

diff --git a/tzdata-2013b-gaza.patch b/tzdata-2013b-gaza.patch
new file mode 100644
index 0000000..1a0d6d4
--- /dev/null
+++ b/tzdata-2013b-gaza.patch
@@ -0,0 +1,92 @@
+Thanks for the heads-up.  Here's a draft patch to the
+tz database, which I've pushed to the experimental repository
+at .
+
+>From 63814cf0a86a5329fecf12e6a60d527a83b9b729 Mon Sep 17 00:00:00 2001
+From: Paul Eggert 
+Date: Tue, 26 Mar 2013 14:23:08 -0700
+Subject: [PATCH] Palestine observes DST starting March 29, 2013.
+
+Thanks to Steffen Thorsen, in
+.
+* asia (Palestine): Add rules for 2011 on, to simplify Gaza and Hebron.
+Adjust to recently announced changed.
+(Asia/Gaza, Asia/Hebron): Use adjusted rules.
+---
+ asia |   46 ++++++++++++++++++++++++----------------------
+ 1 file changed, 24 insertions(+), 22 deletions(-)
+
+diff --git a/asia b/asia
+index 1f09fa3..e94deb7 100644
+--- a/asia
++++ b/asia
+@@ -2291,11 +2291,20 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
+ # http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
+ # 
+ 
+-# From Arthur David Olson (2012-03-27):
+-# The timeanddate article for 2012 says that "the end date has not yet been
+-# announced" and that "Last year, both...paused daylight saving time during...
+-# Ramadan. It is not yet known [for] 2012."
+-# For now, assume both switch back on the last Friday in September. XXX
++# From Steffen Thorsen (2013-03-26):
++# The following news sources tells that Palestine will "start daylight saving
++# time from midnight on Friday, March 29, 2013" (translated).
++# [These are in Arabic and are for Gaza and for Ramallah, respectively.]
++# http://www.samanews.com/index.php?act=Show&id=154120
++# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html
++
++# From Paul Eggert (2013-03-26):
++# For future dates, guess the last Thursday in March at 24:00 through
++# the first Friday on or after September 21 at 01:00.  This is consistent with
++# the predictions in today's editions of the following URLs,
++# which are for Gaza and Hebron respectively:
++# http://www.timeanddate.com/worldclock/timezone.html?n=702
++# http://www.timeanddate.com/worldclock/timezone.html?n=2364
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
+@@ -2317,11 +2326,10 @@ Rule Palestine	2009	only	-	Mar	lastFri	0:00	1:00	S
+ Rule Palestine	2009	only	-	Sep	Fri>=1	2:00	0	-
+ Rule Palestine	2010	only	-	Mar	lastSat	0:01	1:00	S
+ Rule Palestine	2010	only	-	Aug	11	0:00	0	-
+-
+-# From Arthur David Olson (2011-09-20):
+-# 2011 transitions per http://www.timeanddate.com as of 2011-09-20.
+-# From Paul Eggert (2012-10-12):
+-# 2012 transitions per http://www.timeanddate.com as of 2012-10-12.
++Rule Palestine	2011	only	-	Apr	 2	0:01	1:00	S
++Rule Palestine	2011	only	-	Aug	 1	0:00	0	-
++Rule Palestine	2012	max	-	Mar	lastThu	24:00	1:00	S
++Rule Palestine	2012	max	-	Sep	Fri>=21	1:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
+@@ -2329,11 +2337,7 @@ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
+ 			2:00 EgyptAsia	EE%sT	1967 Jun  5
+ 			2:00	Zion	I%sT	1996
+ 			2:00	Jordan	EE%sT	1999
+-			2:00 Palestine	EE%sT	2011 Apr  2 12:01
+-			2:00	1:00	EEST	2011 Aug  1
+-			2:00	-	EET	2012 Mar 30
+-			2:00	1:00	EEST	2012 Sep 21 1:00
+-			2:00	-	EET
++			2:00 Palestine	EE%sT
+ 
+ Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
+ 			2:00	Zion	EET	1948 May 15
+diff --git a/asia b/asia
+index 1f09fa3..e94deb7 100644
+--- a/asia
++++ b/asia
+@@ -2350,9 +2350,7 @@ Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
+ 			2:00	1:00	EEST	2011 Aug  1
+ 			2:00	-	EET	2011 Aug 30
+ 			2:00	1:00	EEST	2011 Sep 30 3:00
+-			2:00	-	EET	2012 Mar 30
+-			2:00	1:00	EEST	2012 Sep 21 1:00
+-			2:00	-	EET
++			2:00 Palestine	EE%sT
+ 
+ # Paracel Is
+ # no information
diff --git a/tzdata.spec b/tzdata.spec
index a6387a5..71e951b 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,14 +3,13 @@ Name: tzdata
 Version: 2013b
 %define tzdata_version 2013b
 %define tzcode_version 2013b
-Release: 1%{?dist}
+Release: 2%{?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
-# __decl_patches
-# __end
+Patch0: tzdata-2013b-gaza.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -35,9 +34,7 @@ This package contains timezone information for use by Java runtimes.
 
 %prep
 %setup -q -c -a 1
-
-# __apply_patches
-# __end
+%patch0 -p1
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -98,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Wed Mar 27 2013 Petr Machata  - 2013b-2
+- Palestine starts Daylight Saving Time on March 29, 2013
+  (tzdata-2013b-gaza.patch)
+
 * Wed Mar 13 2013 Petr Machata  - 2013b-1
 - Upstream 2013b
   - Paraguay will end DST on March 24 this year

From a65369dae5e7a0026cde827791b3d79eee7ce0bf Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 17 May 2013 03:12:46 +0200
Subject: [PATCH 185/280] Upstream 2013c   - Sync past stamps for Palestine and
 West Bank with timeanddate.com   - Assume that the recent change to
 Paraguay's DST rules is permanent   - Macquarie was uninhabited between 1919
 and 1948.  It's also part     of Australia (update in zone.tab).

---
 tzdata-2013b-gaza.patch | 92 -----------------------------------------
 tzdata.spec             | 17 +++++---
 2 files changed, 11 insertions(+), 98 deletions(-)
 delete mode 100644 tzdata-2013b-gaza.patch

diff --git a/tzdata-2013b-gaza.patch b/tzdata-2013b-gaza.patch
deleted file mode 100644
index 1a0d6d4..0000000
--- a/tzdata-2013b-gaza.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Thanks for the heads-up.  Here's a draft patch to the
-tz database, which I've pushed to the experimental repository
-at .
-
->From 63814cf0a86a5329fecf12e6a60d527a83b9b729 Mon Sep 17 00:00:00 2001
-From: Paul Eggert 
-Date: Tue, 26 Mar 2013 14:23:08 -0700
-Subject: [PATCH] Palestine observes DST starting March 29, 2013.
-
-Thanks to Steffen Thorsen, in
-.
-* asia (Palestine): Add rules for 2011 on, to simplify Gaza and Hebron.
-Adjust to recently announced changed.
-(Asia/Gaza, Asia/Hebron): Use adjusted rules.
----
- asia |   46 ++++++++++++++++++++++++----------------------
- 1 file changed, 24 insertions(+), 22 deletions(-)
-
-diff --git a/asia b/asia
-index 1f09fa3..e94deb7 100644
---- a/asia
-+++ b/asia
-@@ -2291,11 +2291,20 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
- # http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
- # 
- 
--# From Arthur David Olson (2012-03-27):
--# The timeanddate article for 2012 says that "the end date has not yet been
--# announced" and that "Last year, both...paused daylight saving time during...
--# Ramadan. It is not yet known [for] 2012."
--# For now, assume both switch back on the last Friday in September. XXX
-+# From Steffen Thorsen (2013-03-26):
-+# The following news sources tells that Palestine will "start daylight saving
-+# time from midnight on Friday, March 29, 2013" (translated).
-+# [These are in Arabic and are for Gaza and for Ramallah, respectively.]
-+# http://www.samanews.com/index.php?act=Show&id=154120
-+# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html
-+
-+# From Paul Eggert (2013-03-26):
-+# For future dates, guess the last Thursday in March at 24:00 through
-+# the first Friday on or after September 21 at 01:00.  This is consistent with
-+# the predictions in today's editions of the following URLs,
-+# which are for Gaza and Hebron respectively:
-+# http://www.timeanddate.com/worldclock/timezone.html?n=702
-+# http://www.timeanddate.com/worldclock/timezone.html?n=2364
- 
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
- Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
-@@ -2317,11 +2326,10 @@ Rule Palestine	2009	only	-	Mar	lastFri	0:00	1:00	S
- Rule Palestine	2009	only	-	Sep	Fri>=1	2:00	0	-
- Rule Palestine	2010	only	-	Mar	lastSat	0:01	1:00	S
- Rule Palestine	2010	only	-	Aug	11	0:00	0	-
--
--# From Arthur David Olson (2011-09-20):
--# 2011 transitions per http://www.timeanddate.com as of 2011-09-20.
--# From Paul Eggert (2012-10-12):
--# 2012 transitions per http://www.timeanddate.com as of 2012-10-12.
-+Rule Palestine	2011	only	-	Apr	 2	0:01	1:00	S
-+Rule Palestine	2011	only	-	Aug	 1	0:00	0	-
-+Rule Palestine	2012	max	-	Mar	lastThu	24:00	1:00	S
-+Rule Palestine	2012	max	-	Sep	Fri>=21	1:00	0	-
- 
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
-@@ -2329,11 +2337,7 @@ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
- 			2:00 EgyptAsia	EE%sT	1967 Jun  5
- 			2:00	Zion	I%sT	1996
- 			2:00	Jordan	EE%sT	1999
--			2:00 Palestine	EE%sT	2011 Apr  2 12:01
--			2:00	1:00	EEST	2011 Aug  1
--			2:00	-	EET	2012 Mar 30
--			2:00	1:00	EEST	2012 Sep 21 1:00
--			2:00	-	EET
-+			2:00 Palestine	EE%sT
- 
- Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
- 			2:00	Zion	EET	1948 May 15
-diff --git a/asia b/asia
-index 1f09fa3..e94deb7 100644
---- a/asia
-+++ b/asia
-@@ -2350,9 +2350,7 @@ Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
- 			2:00	1:00	EEST	2011 Aug  1
- 			2:00	-	EET	2011 Aug 30
- 			2:00	1:00	EEST	2011 Sep 30 3:00
--			2:00	-	EET	2012 Mar 30
--			2:00	1:00	EEST	2012 Sep 21 1:00
--			2:00	-	EET
-+			2:00 Palestine	EE%sT
- 
- # Paracel Is
- # no information
diff --git a/tzdata.spec b/tzdata.spec
index 71e951b..951a56e 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,15 +1,14 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2013b
-%define tzdata_version 2013b
-%define tzcode_version 2013b
-Release: 2%{?dist}
+Version: 2013c
+%define tzdata_version 2013c
+%define tzcode_version 2013c
+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
-Patch0: tzdata-2013b-gaza.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -34,7 +33,6 @@ This package contains timezone information for use by Java runtimes.
 
 %prep
 %setup -q -c -a 1
-%patch0 -p1
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -95,6 +93,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Fri May 17 2013 Petr Machata  - 2013c-1
+- Upstream 2013c
+  - Sync past stamps for Palestine and West Bank with timeanddate.com
+  - Assume that the recent change to Paraguay's DST rules is permanent
+  - Macquarie was uninhabited between 1919 and 1948.  It's also part
+    of Australia (update in zone.tab).
+
 * Wed Mar 27 2013 Petr Machata  - 2013b-2
 - Palestine starts Daylight Saving Time on March 29, 2013
   (tzdata-2013b-gaza.patch)

From 5211b0b392636d8a43b1e6d14337afd5a1e8f604 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 17 May 2013 03:28:52 +0200
Subject: [PATCH 186/280] Add 2013c tarball

---
 .gitignore | 2 ++
 sources    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3787200..34f1c82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,5 @@ noarch/
 /tzcode2012j.tar.gz
 /tzdata2013b.tar.gz
 /tzcode2013b.tar.gz
+/tzdata2013c.tar.gz
+/tzcode2013c.tar.gz
diff --git a/sources b/sources
index 4783f42..7d5b562 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-489dbca77d1f2e287a3987ca047bb246  tzdata2013b.tar.gz
-c8bb91ce60092ef61d628d104ad3dab1  tzcode2013b.tar.gz
+b5062217a2dea6823dd69b4dda97b249  tzdata2013c.tar.gz
+69d333d829802af4475707e32fa01681  tzcode2013c.tar.gz

From 94f766eacb0bcc844d95e71e91dc548de0f26898 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Thu, 4 Jul 2013 14:11:30 +0200
Subject: [PATCH 187/280] Changes for Israel and Morocco

- Update descriptions in iso3166.tab; make Jerusalem coordinates in
  zone.tab more precise
  (0001-Adjust-commentary-to-try-to-defuse-recent-issues-som.patch)
- Update local mean time for Jerusalem to match more-precise longitude
  (0002-asia-Asia-Jerusalem-Fix-LMT-to-match-more-precise-lo.patch)
- Move Morocco's midsummer 2013 transitions
  (0003-Move-Morocco-s-midsummer-2013-transitions.patch)
- Israel now falls back on the last Sunday of October
  (0004-Israel-now-falls-back-on-the-last-Sunday-of-October.patch)
- Resolves: #980807
---
 ...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, 385 insertions(+), 1 deletion(-)
 create mode 100644 0001-Adjust-commentary-to-try-to-defuse-recent-issues-som.patch
 create mode 100644 0002-asia-Asia-Jerusalem-Fix-LMT-to-match-more-precise-lo.patch
 create mode 100644 0003-Move-Morocco-s-midsummer-2013-transitions.patch
 create 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
new file mode 100644
index 0000000..0c72e69
--- /dev/null
+++ b/0001-Adjust-commentary-to-try-to-defuse-recent-issues-som.patch
@@ -0,0 +1,220 @@
+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
new file mode 100644
index 0000000..82d084b
--- /dev/null
+++ b/0002-asia-Asia-Jerusalem-Fix-LMT-to-match-more-precise-lo.patch
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 0000000..cb1131e
--- /dev/null
+++ b/0003-Move-Morocco-s-midsummer-2013-transitions.patch
@@ -0,0 +1,53 @@
+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
new file mode 100644
index 0000000..4a59737
--- /dev/null
+++ b/0004-Israel-now-falls-back-on-the-last-Sunday-of-October.patch
@@ -0,0 +1,63 @@
+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 951a56e..18a6a25 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,12 +3,16 @@ Name: tzdata
 Version: 2013c
 %define tzdata_version 2013c
 %define tzcode_version 2013c
-Release: 1%{?dist}
+Release: 2%{?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
@@ -34,6 +38,11 @@ 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
@@ -93,6 +102,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Thu Jul  4 2013 Petr Machata  - 2013c-2
+- Update descriptions in iso3166.tab; make Jerusalem coordinates in
+  zone.tab more precise
+  (0001-Adjust-commentary-to-try-to-defuse-recent-issues-som.patch)
+- Update local mean time for Jerusalem to match more-precise longitude
+  (0002-asia-Asia-Jerusalem-Fix-LMT-to-match-more-precise-lo.patch)
+- Move Morocco's midsummer 2013 transitions
+  (0003-Move-Morocco-s-midsummer-2013-transitions.patch)
+- Israel now falls back on the last Sunday of October
+  (0004-Israel-now-falls-back-on-the-last-Sunday-of-October.patch)
+
 * Fri May 17 2013 Petr Machata  - 2013c-1
 - Upstream 2013c
   - Sync past stamps for Palestine and West Bank with timeanddate.com

From a01b55f48f87281fb814e2867c85b62171150fe2 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 26 Jul 2013 20:34:15 +0200
Subject: [PATCH 188/280] 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

From 556f8d18c60b43ef313cd51fbce673ce759a7bc4 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 26 Jul 2013 20:39:36 +0200
Subject: [PATCH 189/280] Upload 2013d sources

---
 .gitignore | 2 ++
 sources    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 34f1c82..7aa1c05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,5 @@ noarch/
 /tzcode2013b.tar.gz
 /tzdata2013c.tar.gz
 /tzcode2013c.tar.gz
+/tzdata2013d.tar.gz
+/tzcode2013d.tar.gz
diff --git a/sources b/sources
index 7d5b562..a5c372f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-b5062217a2dea6823dd69b4dda97b249  tzdata2013c.tar.gz
-69d333d829802af4475707e32fa01681  tzcode2013c.tar.gz
+65b6818162230fc02f86f293376c73df  tzdata2013d.tar.gz
+4616a9560270f180eeb9a08540636890  tzcode2013d.tar.gz

From 77260a24dc54c6f161f609ed9a0c6217f00da1e5 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 3 Oct 2013 14:29:54 -0400
Subject: [PATCH 190/280] - Morocco moved end of DST from September to October.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 10 +++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7aa1c05..bec0d7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,5 @@ noarch/
 /tzcode2013c.tar.gz
 /tzdata2013d.tar.gz
 /tzcode2013d.tar.gz
+/tzdata2013g.tar.gz
+/tzcode2013g.tar.gz
diff --git a/sources b/sources
index a5c372f..f253f84 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-65b6818162230fc02f86f293376c73df  tzdata2013d.tar.gz
-4616a9560270f180eeb9a08540636890  tzcode2013d.tar.gz
+76dbc3b5a81913fc0d824376c44a5d15  tzdata2013g.tar.gz
+cc2a52297310ba1a673dc60973ea3ad8  tzcode2013g.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 2382705..c90acd1 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2013d
-%define tzdata_version 2013d
-%define tzcode_version 2013d
+Version: 2013g
+%define tzdata_version 2013g
+%define tzcode_version 2013g
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -93,6 +93,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Thu Oct  3 2013 Patsy Franklin  2013g-1
+- Morocco moved end of DST from September to October.  Rebase to
+  pick up the Morocco DST change.
+
 * Fri Jul 26 2013 Petr Machata  - 2013d-1
 - Rebase to 2013d
   - No fundamental changes

From 71ba94712d364f9134a8fd7dc0196a24bd2df4aa Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 30 Oct 2013 14:08:55 -0400
Subject: [PATCH 191/280] - Rebase to 2013h   - Lybia switched to using UTC+2
 without DST   - Western Sahara (Africa/ElAaiun) uses Morocco's DST rules   -
 Acres and Amazon swithc to UTC-4 and UTC-5 on 2013-11-10   - Add entries for
 DST transition in Morocco in the year 2038

---
 .gitignore  |  2 ++
 sources     |  2 ++
 tzdata.spec | 13 ++++++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index bec0d7b..36e043c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,5 @@ noarch/
 /tzcode2013d.tar.gz
 /tzdata2013g.tar.gz
 /tzcode2013g.tar.gz
+/tzcode2013h.tar.gz
+/tzdata2013h.tar.gz
diff --git a/sources b/sources
index f253f84..b8971bb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,5 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 76dbc3b5a81913fc0d824376c44a5d15  tzdata2013g.tar.gz
 cc2a52297310ba1a673dc60973ea3ad8  tzcode2013g.tar.gz
+14250703b253e1cfdf97f1e928541508  tzcode2013h.tar.gz
+d310abe42cbe87e76ceb69e2c7003c92  tzdata2013h.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index c90acd1..ae7a1fd 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2013g
-%define tzdata_version 2013g
-%define tzcode_version 2013g
+Version: 2013h
+%define tzdata_version 2013h
+%define tzcode_version 2013h
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -93,6 +93,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Wed Oct 30 2013 Patsy Franklin  2013h-1
+- Rebase to 2013h 
+  - Lybia switched to using UTC+2 without DST
+  - Western Sahara (Africa/ElAaiun) uses Morocco's DST rules
+  - Acres and Amazon swithc to UTC-4 and UTC-5 on 2013-11-10
+  - Add entries for DST transition in Morocco in the year 2038
+ 
 * Thu Oct  3 2013 Patsy Franklin  2013g-1
 - Morocco moved end of DST from September to October.  Rebase to
   pick up the Morocco DST change.

From 28713e72b47c7bdfa81d89f3d7b7bbb490c4bfce Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 30 Oct 2013 14:55:08 -0400
Subject: [PATCH 192/280] -Update sources file.

---
 sources | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sources b/sources
index b8971bb..580a3e8 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-76dbc3b5a81913fc0d824376c44a5d15  tzdata2013g.tar.gz
-cc2a52297310ba1a673dc60973ea3ad8  tzcode2013g.tar.gz
 14250703b253e1cfdf97f1e928541508  tzcode2013h.tar.gz
 d310abe42cbe87e76ceb69e2c7003c92  tzdata2013h.tar.gz

From 1046f325718b9a006e4b1c31080efd188c0493cc Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 18 Dec 2013 00:49:33 -0500
Subject: [PATCH 193/280] Resolves: #1044305   -rebase to 2013i   Jordan
 switches back to standard time at 00:00 on December 20,2013.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 16 ++++++++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 36e043c..e34b94c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,3 +97,5 @@ noarch/
 /tzcode2013g.tar.gz
 /tzcode2013h.tar.gz
 /tzdata2013h.tar.gz
+/tzcode2013i.tar.gz
+/tzdata2013i.tar.gz
diff --git a/sources b/sources
index 580a3e8..3367216 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-14250703b253e1cfdf97f1e928541508  tzcode2013h.tar.gz
-d310abe42cbe87e76ceb69e2c7003c92  tzdata2013h.tar.gz
+acee8e586bf125109f64c4911cfc82f6  tzcode2013i.tar.gz
+778b4ca53a7cdf61d5147bef328f02b8  tzdata2013i.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index ae7a1fd..e599a33 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2013h
-%define tzdata_version 2013h
-%define tzcode_version 2013h
+Version: 2013i
+%define tzdata_version 2013i
+%define tzcode_version 2013i
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -54,7 +54,7 @@ popd
 
 %build
 FILES="africa antarctica asia australasia europe northamerica southamerica
-	pacificnew etcetera backward solar87 solar88 solar89"
+	pacificnew etcetera backward"
 
 mkdir zoneinfo/{,posix,right}
 zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
@@ -93,6 +93,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Wed Dec 18 2013 Patsy Franklin  2013i-1
+- Rebase with early release of 2013i from Paul Eggert github.
+  - Jordan switches back to standard time at 00:00 on December 20,2013.
+  - The 2006-2011 transition schedule is planned to resume in 2014.
+  - The compile-time flag NOSOLAR has been removed.
+  - The files solar87, solar88, and solar89 are no longer distributed.
+  - tz-link.htm now mentions Noda Time.
+
 * Wed Oct 30 2013 Patsy Franklin  2013h-1
 - Rebase to 2013h 
   - Lybia switched to using UTC+2 without DST

From f5ae10705fdc83f017256684ef0331b957c26ded Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 22 Jan 2014 12:39:46 -0500
Subject: [PATCH 194/280] Resolves: #1054879 - Fiji ends DST on 2014-01-19 at
 02:00, not the previously scheduled 03:00.

---
 001-tzdata-fiji-dst.patch | 55 +++++++++++++++++++++++++++++++++++++++
 tzdata.spec               |  8 +++++-
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 001-tzdata-fiji-dst.patch

diff --git a/001-tzdata-fiji-dst.patch b/001-tzdata-fiji-dst.patch
new file mode 100644
index 0000000..cdbd96f
--- /dev/null
+++ b/001-tzdata-fiji-dst.patch
@@ -0,0 +1,55 @@
+diff -Nrup a/australasia b/australasia
+--- a/australasia	2013-12-17 10:26:04.000000000 -0500
++++ b/australasia	2014-01-21 11:37:08.135130460 -0500
+@@ -354,16 +354,18 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
+ # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
+ 
+ # From the Fijian Government Media Center (2013-08-30) via David Wheeler:
+-# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am
+-# on Sunday 19th January, 2014....  move clocks forward by one hour from 2am
++# Fiji will start daylight savings on Sunday 27th October, 2013 ...
++# move clocks forward by one hour from 2am
+ # http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
+-#
+-# From Paul Eggert (2013-09-09):
++
++# From Steffen Thorsen (2013-01-10):
++# Fiji will end DST on 2014-01-19 02:00:
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
++
++# From Paul Eggert (2014-10-10):
+ # For now, guess that Fiji springs forward the Sunday before the fourth
+-# Monday in October.  This matches both recent practice and
+-# timeanddate.com's current spring-forward prediction.
+-# For the January 2014 transition we guessed right while timeanddate.com
+-# guessed wrong, so leave the fall-back prediction alone.
++# Monday in October, and springs back the penultimate Sunday in January.
++# This is ad hoc, but matches recent practice.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
+@@ -372,7 +374,8 @@ Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
+ Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
+ Rule	Fiji	2010	max	-	Oct	Sun>=21	2:00	1:00	S
+ Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
+-Rule	Fiji	2012	max	-	Jan	Sun>=18	3:00	0	-
++Rule    Fiji    2012    2013    -    Jan    Sun>=18    3:00    0    -
++Rule    Fiji    2014    max    -    Jan    Sun>=18    2:00    0    -
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26	# Suva
+ 			12:00	Fiji	FJ%sT	# Fiji Time
+diff -Nrup a/NEWS b/NEWS
+--- a/NEWS	2013-12-17 10:26:04.000000000 -0500
++++ b/NEWS	2014-01-21 11:37:08.136130469 -0500
+@@ -13,6 +13,11 @@ Release 2013i - 2013-12-17 07:25:23 -080
+     In 2004, Cuba began DST on March 28, not April 4.
+     (Thanks to Steffen Thorsen.)
+ 
++  Changes affecting near-future time stamps
++
++    Fiji ends DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00.
++    (Thanks to Steffen Thorsen.)
++
+   Changes affecting code
+ 
+     The compile-time flag NOSOLAR has been removed, as nowadays the
diff --git a/tzdata.spec b/tzdata.spec
index e599a33..bcab843 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,12 +3,13 @@ Name: tzdata
 Version: 2013i
 %define tzdata_version 2013i
 %define tzcode_version 2013i
-Release: 1%{?dist}
+Release: 2%{?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
+Patch1: 001-tzdata-fiji-dst.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -34,6 +35,8 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
+%patch1 -p1
+
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
 pushd javazic
@@ -93,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Tue Jan 21 2014 Patsy Franklin  2013i-2
+- Fiji ends DST on 2014-01-19 at 02:00, not the previously scheduled 03:00.
+
 * Wed Dec 18 2013 Patsy Franklin  2013i-1
 - Rebase with early release of 2013i from Paul Eggert github.
   - Jordan switches back to standard time at 00:00 on December 20,2013.

From 1198dd34ba1f9cb6194caa1848af5a1243401fbe Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 12 Mar 2014 13:27:21 -0400
Subject: [PATCH 195/280] Resolves: #1075002 - Rebase to 2014a   - Turkey
 begins DST on 2014-03-31, not 03-30.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 26 ++++++++++++++++----------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index e34b94c..27050e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,5 @@ noarch/
 /tzdata2013h.tar.gz
 /tzcode2013i.tar.gz
 /tzdata2013i.tar.gz
+/tzdata2014a.tar.gz
+/tzcode2014a.tar.gz
diff --git a/sources b/sources
index 3367216..41eebe0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-acee8e586bf125109f64c4911cfc82f6  tzcode2013i.tar.gz
-778b4ca53a7cdf61d5147bef328f02b8  tzdata2013i.tar.gz
+423a11bcffc10dda578058cf1587d048  tzdata2014a.tar.gz
+77ccbb720f0f2076f12dff6ded70eb98  tzcode2014a.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index bcab843..a5117b8 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,15 +1,16 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2013i
-%define tzdata_version 2013i
-%define tzcode_version 2013i
-Release: 2%{?dist}
+Version: 2014a
+%define tzdata_version 2014a
+%define tzcode_version 2014a
+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
-Patch1: 001-tzdata-fiji-dst.patch
+# Add new patches here...
+# Patch1: your-new-patch.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -35,7 +36,8 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
-%patch1 -p1
+# Add new patches here...
+# %patch1 -p1
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -57,7 +59,7 @@ popd
 
 %build
 FILES="africa antarctica asia australasia europe northamerica southamerica
-	pacificnew etcetera backward"
+       pacificnew etcetera backward"
 
 mkdir zoneinfo/{,posix,right}
 zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
@@ -96,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Wed Mar 12 2014 Patsy Franklin  2014a-1
+- Rebase to 2014a
+  - Turkey begins DST on 2014-03-31, not 03-30.
+
 * Tue Jan 21 2014 Patsy Franklin  2013i-2
 - Fiji ends DST on 2014-01-19 at 02:00, not the previously scheduled 03:00.
 
@@ -573,7 +579,7 @@ rm -rf $RPM_BUILD_ROOT
 - Upstream 2008d
   - Changes for Brazil and Mauritius
 
-* Wed May 30 2008 Petr Machata  - 2008c-1
+* Fri May 30 2008 Petr Machata  - 2008c-1
 - Upstream 2008c
   - Mongolia changes zone
   - Pakistan DST is scheduled until Sep/1, instead of Aug/31
@@ -618,7 +624,7 @@ rm -rf $RPM_BUILD_ROOT
   - Iran will resume DST next year
   - Venezuela is scheduled to change TZ to -4:30 on January 1
 
-* Thu Sep 25 2007 Keith Seitz  - 2007g-2
+* Tue Sep 25 2007 Keith Seitz  - 2007g-2
 - Add support for building java's zoneinfo files in new
   tzdata-java RPM.
 
@@ -757,7 +763,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Mar 16 2006 Petr Machata  - 2006b-2
 - Patch for Sri Lanka time zone change (#184514)
 
-* Thu Feb 22 2006 Petr Machata  2006b-1
+* Wed Feb 22 2006 Petr Machata  2006b-1
 - Upstream 2006b:
   - using tz64code version, as 32 is legacy according to tzdata ML
   - new manual pages for ctime, strftime, tzset

From a177fd0a22e57472af3c34219946271a924aa4f9 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 26 Mar 2014 15:57:18 -0400
Subject: [PATCH 196/280] Resolves: #1080928 - Rebase to tzdata-2014b   -
 Crimea changes to Moscow time on March, 30, 2014.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 10 +++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 27050e4..1eea931 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,5 @@ noarch/
 /tzdata2013i.tar.gz
 /tzdata2014a.tar.gz
 /tzcode2014a.tar.gz
+/tzcode2014b.tar.gz
+/tzdata2014b.tar.gz
diff --git a/sources b/sources
index 41eebe0..eed69ee 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-423a11bcffc10dda578058cf1587d048  tzdata2014a.tar.gz
-77ccbb720f0f2076f12dff6ded70eb98  tzcode2014a.tar.gz
+7629513a4dbd107b7da946123d498c6b  tzcode2014b.tar.gz
+c58d556612396d4ca5a17807a79924e5  tzdata2014b.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index a5117b8..e72a239 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2014a
-%define tzdata_version 2014a
-%define tzcode_version 2014a
+Version: 2014b
+%define tzdata_version 2014b
+%define tzcode_version 2014b
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -98,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Wed Mar 26 2014 Patsy Franklin  2014b-1
+- Rebase to 2014b
+  - Crimea changes to Moscow time on March 30, 2014.
+
 * Wed Mar 12 2014 Patsy Franklin  2014a-1
 - Rebase to 2014a
   - Turkey begins DST on 2014-03-31, not 03-30.

From 8e01d8936f661f5765ab73ce6560ddb2dcbf604b Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 14 May 2014 16:46:18 -0400
Subject: [PATCH 197/280] Resolves: #1095669 - Egypt's government decided to
 re-apply DTS starting   May 15, 2014 at 24:00.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1eea931..26e8f6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,5 @@ noarch/
 /tzcode2014a.tar.gz
 /tzcode2014b.tar.gz
 /tzdata2014b.tar.gz
+/tzcode2014c.tar.gz
+/tzdata2014c.tar.gz
diff --git a/sources b/sources
index eed69ee..f9bbd38 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-7629513a4dbd107b7da946123d498c6b  tzcode2014b.tar.gz
-c58d556612396d4ca5a17807a79924e5  tzdata2014b.tar.gz
+657636f201ae8b561225afde49d274af  tzcode2014c.tar.gz
+fa7f3dc1c6f6238253a6f2b850467e2e  tzdata2014c.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index e72a239..4d07f85 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2014b
-%define tzdata_version 2014b
-%define tzcode_version 2014b
+Version: 2014c
+%define tzdata_version 2014c
+%define tzcode_version 2014c
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -98,6 +98,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi
 
 %changelog
+* Wed May 14 2014 Patsy Franklin  2014c-1
+- Rebase to 2014c
+  -Egypt will re-apply DST on May 15 at 24:00, except that DST
+   will not be observed during Ramadan.
+
 * Wed Mar 26 2014 Patsy Franklin  2014b-1
 - Rebase to 2014b
   - Crimea changes to Moscow time on March 30, 2014.

From 5abe2e33651ebdffa803012f0dca184fcce0f362 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 28 May 2014 11:25:03 -0400
Subject: [PATCH 198/280] Resolves: #1091029 - Adds tzdata-java support for new
 tzdata file format used by OpenJDK8.

---
 .gitignore  |  1 +
 sources     |  1 +
 tzdata.spec | 23 ++++++++++++++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 26e8f6e..5ea2433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,4 @@ noarch/
 /tzdata2014b.tar.gz
 /tzcode2014c.tar.gz
 /tzdata2014c.tar.gz
+/javazic-1.8-37392f2f5d59.tar.xz
diff --git a/sources b/sources
index f9bbd38..f6cb643 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 657636f201ae8b561225afde49d274af  tzcode2014c.tar.gz
 fa7f3dc1c6f6238253a6f2b850467e2e  tzdata2014c.tar.gz
+cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
diff --git a/tzdata.spec b/tzdata.spec
index 4d07f85..ecb907e 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2014c
 %define tzdata_version 2014c
 %define tzcode_version 2014c
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -27,6 +27,7 @@ the world.
 Summary: Timezone data for Java
 Group: System Environment/Base
 Source3: javazic.tar.gz
+Source4: javazic-1.8-37392f2f5d59.tar.xz
 Patch100: javazic-fixup.patch
 Patch101: javazic-exclusion-fix.patch
 
@@ -57,6 +58,10 @@ find . -type f -name '*.java' -print0 \
                          -e 's:sun\.util\.:rht.util.:g'
 popd
 
+tar xf %{SOURCE4}
+
+echo "%{name}%{tzdata_version}" >> VERSION
+
 %build
 FILES="africa antarctica asia australasia europe northamerica southamerica
        pacificnew etcetera backward"
@@ -68,6 +73,7 @@ zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
 
 grep -v tz-art.htm tz-link.htm > tz-link.html
 
+# Java 6/7 tzdata
 pushd javazic
 javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
 popd
@@ -76,12 +82,23 @@ java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
   -d javazi \
   $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
 
+# Java 8 tzdata
+pushd javazic-1.8
+javac -source 1.7 -target 1.7 -classpath . `find . -name \*.java`
+popd
+
+java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
+    -srcdir . -dstfile tzdb.dat \
+    $FILES `find -type f javazic-1.8/tzdata_jdk/`
+
 %install
 rm -fr $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}
 cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir}
 install -p -m 644 zone.tab iso3166.tab $RPM_BUILD_ROOT%{_datadir}/zoneinfo
 cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
+install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,8 +113,12 @@ rm -rf $RPM_BUILD_ROOT
 %files java
 %defattr(-,root,root)
 %{_datadir}/javazi
+%{_datadir}/javazi-1.8
 
 %changelog
+* Wed May 28 2014 Patsy Franklin  2014c-2
+- Add support for new tzdata file format used by OpenJDK8.
+
 * Wed May 14 2014 Patsy Franklin  2014c-1
 - Rebase to 2014c
   -Egypt will re-apply DST on May 15 at 24:00, except that DST

From 092c8f6a5c1d6508e43d4833917b87392bf23362 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore 
Date: Sun, 8 Jun 2014 04:20:25 -0500
Subject: [PATCH 199/280] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 tzdata.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index ecb907e..e38a0e7 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2014c
 %define tzdata_version 2014c
 %define tzcode_version 2014c
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Sun Jun 08 2014 Fedora Release Engineering  - 2014c-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Wed May 28 2014 Patsy Franklin  2014c-2
 - Add support for new tzdata file format used by OpenJDK8.
 

From 086e89b0de37e10a13e08771f2a854115b73e7f9 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Tue, 17 Jun 2014 21:34:29 -0400
Subject: [PATCH 200/280] -Rebase to 2014e  - Morrocco suspends DTS for Ramadan
      June 28 at 03:00 and August 2 at 02:00  - Egypt suspends DTS for Ramadan
      June 26 and July 31 at 24:00 -Additional edit to support OpenJDK8.
 (#1091029)

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 17 +++++++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5ea2433..8424997 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,5 @@ noarch/
 /tzcode2014c.tar.gz
 /tzdata2014c.tar.gz
 /javazic-1.8-37392f2f5d59.tar.xz
+/tzcode2014e.tar.gz
+/tzdata2014e.tar.gz
diff --git a/sources b/sources
index f6cb643..d964b3a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-657636f201ae8b561225afde49d274af  tzcode2014c.tar.gz
-fa7f3dc1c6f6238253a6f2b850467e2e  tzdata2014c.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
+552251600ee3571c244d33c7196ec2ed  tzcode2014e.tar.gz
+8a49fdedd4e832da8e85f7f9bcaedc33  tzdata2014e.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index e38a0e7..f436ddb 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2014c
-%define tzdata_version 2014c
-%define tzcode_version 2014c
+Version: 2014e
+%define tzdata_version 2014e
+%define tzcode_version 2014e
 Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -89,7 +89,8 @@ popd
 
 java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
     -srcdir . -dstfile tzdb.dat \
-    $FILES `find -type f javazic-1.8/tzdata_jdk/`
+    -verbose \
+    $FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -116,6 +117,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Jun 17 2014 Patsy Franklin  - 2014e-1
+- Rebase to 2014e
+  - Morrocco suspends DTS for Ramadan
+       June 28 at 03:00 and August 2 at 02:00
+  - Egypt suspends DTS for Ramadan
+       June 26 and July 31 at 24:00
+- Additional edit to support OpenJDK8. (#1091029)
+
 * Sun Jun 08 2014 Fedora Release Engineering  - 2014c-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From 4d236dc42c3ccdb33e80dcd02ad6a3cb446af9a3 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 18 Jun 2014 09:44:33 -0400
Subject: [PATCH 201/280] - Update changelog version to match release version.

---
 tzdata.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tzdata.spec b/tzdata.spec
index f436ddb..b60a153 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2014e
 %define tzdata_version 2014e
 %define tzcode_version 2014e
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -117,7 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
-* Tue Jun 17 2014 Patsy Franklin  - 2014e-1
+* Wed Jun 18 2014 Patsy Franklin  - 2014e-4
+- Update changelog version to match release version.
+
+* Tue Jun 17 2014 Patsy Franklin  - 2014e-3
 - Rebase to 2014e
   - Morrocco suspends DTS for Ramadan
        June 28 at 03:00 and August 2 at 02:00

From 230b1321ecd9ab1f1cdd5edafb7eb1f5ec5eef53 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 14 Aug 2014 14:31:40 -0400
Subject: [PATCH 202/280] 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 66c1d212b7669bac05c0d0efb2c9d8be8b8a7e80 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 14 Aug 2014 16:03:42 -0400
Subject: [PATCH 203/280] 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 b997064c8b95f2b0783da4e9c289621b42a00245 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 11 Sep 2014 10:53:52 -0400
Subject: [PATCH 204/280] 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..6ca715d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,3 +110,5 @@ noarch/
 /tzdata2014e.tar.gz
 /tzcode2014f.tar.gz
 /tzdata2014f.tar.gz
+/tzcode2014g.tar.gz
+/tzdata2014g.tar.gz
diff --git a/sources b/sources
index bb407ae..198bdbc 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
+f154679d48b724fe191efc19b55abd24  tzcode2014g.tar.gz
+f9f59425e55b21d2e52bb3a95fc17b8d  tzdata2014g.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 df06868aa3641c9018b1f719fe9f00c31c6ca0b7 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 11 Sep 2014 10:56:29 -0400
Subject: [PATCH 205/280] 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 206/280] 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 44fed1e26b1c7663bbc481b62ae08c8f29184a40 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Mon, 6 Oct 2014 22:40:00 -0400
Subject: [PATCH 207/280] 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 6ca715d..ab89263 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,3 +112,5 @@ noarch/
 /tzdata2014f.tar.gz
 /tzcode2014g.tar.gz
 /tzdata2014g.tar.gz
+/tzcode2014h.tar.gz
+/tzdata2014h.tar.gz
diff --git a/sources b/sources
index 198bdbc..4719232 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-f154679d48b724fe191efc19b55abd24  tzcode2014g.tar.gz
-f9f59425e55b21d2e52bb3a95fc17b8d  tzdata2014g.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 1cb2146f733bc83427f3c7ac2a6bf6bb58006d96 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Mon, 27 Oct 2014 18:54:13 -0400
Subject: [PATCH 208/280] 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 ab89263..785efcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,5 @@ noarch/
 /tzdata2014g.tar.gz
 /tzcode2014h.tar.gz
 /tzdata2014h.tar.gz
+/tzcode2014i.tar.gz
+/tzdata2014i.tar.gz
diff --git a/sources b/sources
index 4719232..2bc9923 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
+7fa413158f01a961348aa6a289b6be21  tzcode2014i.tar.gz
+00adeb62a0897aac5ba67da838351adb  tzdata2014i.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 11f738e83c0857f2a7427d8ffe76bbcd83ce4148 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Mon, 27 Oct 2014 18:59:40 -0400
Subject: [PATCH 209/280] 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 f5f2ec3a87c19e4a1bd1fde81eeec9ce485f8fe6 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 20 Nov 2014 14:18:07 -0500
Subject: [PATCH 210/280] 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 785efcc..dbf8912 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,3 +116,5 @@ noarch/
 /tzdata2014h.tar.gz
 /tzcode2014i.tar.gz
 /tzdata2014i.tar.gz
+/tzcode2014j.tar.gz
+/tzdata2014j.tar.gz
diff --git a/sources b/sources
index 2bc9923..cb42899 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-7fa413158f01a961348aa6a289b6be21  tzcode2014i.tar.gz
-00adeb62a0897aac5ba67da838351adb  tzdata2014i.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 43fe4727950b8853aa123b12f7fcced0c7b7d4d2 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 20 Nov 2014 14:57:10 -0500
Subject: [PATCH 211/280] 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 602bfca85b4f8b6eb83895db89160c535a541118 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Fri, 13 Feb 2015 12:01:54 -0500
Subject: [PATCH 212/280] 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..0d0e305 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,3 +118,5 @@ noarch/
 /tzdata2014i.tar.gz
 /tzcode2014j.tar.gz
 /tzdata2014j.tar.gz
+/tzdata2015a.tar.gz
+/tzcode2015a.tar.gz
diff --git a/sources b/sources
index cb42899..5fa3ec8 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
+4ed11c894a74a5ea64201b1c6dbb8831  tzdata2015a.tar.gz
+8f375ede46ae137fbac047ac431bda37  tzcode2015a.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 2a337061dc24ff8ca96088783606d89489487be9 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Fri, 13 Feb 2015 12:02:58 -0500
Subject: [PATCH 213/280] 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 214/280] 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 1715e80fd988c31a6d20eef0d3f8e029f969125d Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 25 Mar 2015 21:52:44 -0400
Subject: [PATCH 215/280] 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 0d0e305..20b50eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,3 +120,5 @@ noarch/
 /tzdata2014j.tar.gz
 /tzdata2015a.tar.gz
 /tzcode2015a.tar.gz
+/tzdata2015b.tar.gz
+/tzcode2015b.tar.gz
diff --git a/sources b/sources
index 5fa3ec8..e5aa851 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-4ed11c894a74a5ea64201b1c6dbb8831  tzdata2015a.tar.gz
-8f375ede46ae137fbac047ac431bda37  tzcode2015a.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 09c88e36aabea654e1980d7c086c4414e516499e Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 25 Mar 2015 21:53:24 -0400
Subject: [PATCH 216/280] 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 217/280] 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 d9635e70ebfded6198ff8017e9089cf2a1536c74 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 16 Apr 2015 23:04:02 -0400
Subject: [PATCH 218/280] 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 on    
 Thursday, April 30 at 24:00, not Friday, April 24 at 00:00.  Similar fixes   
  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 20b50eb..488d165 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,3 +122,5 @@ noarch/
 /tzcode2015a.tar.gz
 /tzdata2015b.tar.gz
 /tzcode2015b.tar.gz
+/tzcode2015c.tar.gz
+/tzdata2015c.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..535ec89 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
+182c85e99be2bcc6b77d9956c8c0dcce  tzcode2015c.tar.gz
+4b4a3e344786198c46909e5afde08788  tzdata2015c.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 d3735449b86a239c5edf11009fb01e619ca75d1b Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 16 Apr 2015 23:07:29 -0400
Subject: [PATCH 219/280] 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 220/280] 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 a1624be1d4f284841053a447dca7fdbb52c44ee8 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Mon, 27 Apr 2015 22:49:39 -0400
Subject: [PATCH 221/280] 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 488d165..4f3bb5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,3 +124,5 @@ noarch/
 /tzcode2015b.tar.gz
 /tzcode2015c.tar.gz
 /tzdata2015c.tar.gz
+/tzcode2015d.tar.gz
+/tzdata2015d.tar.gz
diff --git a/sources b/sources
index 535ec89..d70f5e6 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-182c85e99be2bcc6b77d9956c8c0dcce  tzcode2015c.tar.gz
-4b4a3e344786198c46909e5afde08788  tzdata2015c.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 1e837f73e6fdea805dfc633c7cd3cd75bff1c676 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Mon, 27 Apr 2015 22:56:08 -0400
Subject: [PATCH 222/280] 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 223/280] 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 e765cdafe77bef85e4c163e16fff2e8b447dfc9c Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Fri, 12 Jun 2015 12:23:22 -0400
Subject: [PATCH 224/280] 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 f70e75208f0c2196632ac694fe5ca9feab7195d0 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Fri, 12 Jun 2015 12:28:16 -0400
Subject: [PATCH 225/280] 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 226/280] 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 6869c9f56a45b7e0200cc0f0e3b259081938bbdc Mon Sep 17 00:00:00 2001
From: Dennis Gilmore 
Date: Fri, 19 Jun 2015 03:39:08 +0000
Subject: [PATCH 227/280] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 tzdata.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index 1954286..0c27ee0 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2015d
 %define tzdata_version 2015d
 %define tzcode_version 2015d
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering  - 2015d-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * 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.

From 147f8abfa14555e12d909d85a5b2d9a316291b8c Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Fri, 19 Jun 2015 09:56:59 -0400
Subject: [PATCH 228/280] Resolves: #1231500 - rebase to tzdata-2015e   -
 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.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 18 ++++++++++--------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f3bb5f..b30769e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,3 +126,5 @@ noarch/
 /tzdata2015c.tar.gz
 /tzcode2015d.tar.gz
 /tzdata2015d.tar.gz
+/tzcode2015e.tar.gz
+/tzdata2015e.tar.gz
diff --git a/sources b/sources
index d70f5e6..e6a5412 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-4008a3abc025a398697b2587c48258b9  tzcode2015d.tar.gz
-b595bdc4474b8fc1a15cffc67c66025b  tzdata2015d.tar.gz
+fb62eb6daf3ddb8c41fd40be05ec657e  tzcode2015e.tar.gz
+36f9056efb432ca945c73397acfce0d4  tzdata2015e.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 0c27ee0..4ea7564 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,17 +1,15 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2015d
-%define tzdata_version 2015d
-%define tzcode_version 2015d
-Release: 4%{?dist}
+Version: 2015e
+%define tzdata_version 2015e
+%define tzcode_version 2015e
+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
 # Add new patches here...
-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
@@ -42,8 +40,6 @@ This package contains timezone information for use by Java runtimes.
 %setup -q -c -a 1
 
 # Add new patches here...
-%patch0 -p1
-%patch1 -p1
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -125,6 +121,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Fri Jun 19 2015 Patsy Franklin  - 2015e-1
+- 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.
+- Assume Cayman Islands will observe DST starting next year, using US rules.
+  Although it isn't guaranteed, it is the most likely.
+
 * Fri Jun 19 2015 Fedora Release Engineering  - 2015d-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From 993408a61886652f57925b6105c6edbb7f734ec6 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 12 Aug 2015 09:58:21 -0400
Subject: [PATCH 229/280] Resolves: #1252645 - Rebase to 2015f   - North Korea
 switches to +0830 on 2015-08-15.     The abbreviation remains "KST".   -
 Uruguay no longer observes DST.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 12 +++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b30769e..3b10f91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,3 +128,5 @@ noarch/
 /tzdata2015d.tar.gz
 /tzcode2015e.tar.gz
 /tzdata2015e.tar.gz
+/tzcode2015f.tar.gz
+/tzdata2015f.tar.gz
diff --git a/sources b/sources
index e6a5412..ae45050 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-fb62eb6daf3ddb8c41fd40be05ec657e  tzcode2015e.tar.gz
-36f9056efb432ca945c73397acfce0d4  tzdata2015e.tar.gz
+19578d432ba8b92f73406a17a9bc268d  tzcode2015f.tar.gz
+e3b82732d20e973e48af1c6f13df9a1d  tzdata2015f.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 4ea7564..7b6d3cb 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2015e
-%define tzdata_version 2015e
-%define tzcode_version 2015e
+Version: 2015f
+%define tzdata_version 2015f
+%define tzcode_version 2015f
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -121,6 +121,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Aug 12 2015 Patsy Franklin  - 2015f-1
+- Rebase to 2015f
+  - North Korea switches to +0830 on 2015-08-15.
+    The abbreviation remains "KST".
+  - Uruguay no longer observes DST.
+
 * Fri Jun 19 2015 Patsy Franklin  - 2015e-1
 - 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.

From fc4de1811698909ae6bd870cfaed65cb5e9391ae Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Mon, 5 Oct 2015 15:44:37 -0400
Subject: [PATCH 230/280] Resolves: #1268171 - Rebase to 2015g   - Turkey's
 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.   - Norfolk
 moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.   - Fiji's 2016
 fall-back transition is scheduled for January 17, not 24.   - Fort Nelson,
 British Columbia will not fall back on 2015-11-01.  It has     effectively
 been on MST (-0700) since it advanced its clocks on 2015-03-08.     New zone
 America/Fort_Nelson.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3b10f91..41df24b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,3 +130,5 @@ noarch/
 /tzdata2015e.tar.gz
 /tzcode2015f.tar.gz
 /tzdata2015f.tar.gz
+/tzcode2015g.tar.gz
+/tzdata2015g.tar.gz
diff --git a/sources b/sources
index ae45050..e4102e5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-19578d432ba8b92f73406a17a9bc268d  tzcode2015f.tar.gz
-e3b82732d20e973e48af1c6f13df9a1d  tzdata2015f.tar.gz
+a2c47d908a6426f530efb1393cf1cd06  tzcode2015g.tar.gz
+8d46e8b225b9a04c75f5c39636435ad6  tzdata2015g.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 7b6d3cb..1001ccc 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2015f
-%define tzdata_version 2015f
-%define tzcode_version 2015f
+Version: 2015g
+%define tzdata_version 2015g
+%define tzcode_version 2015g
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -121,6 +121,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Mon Oct 05 2015 Patsy Franklin  - 2015g-1
+- Rebase to 2015g
+  - Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.
+  - Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.
+  - Fiji's 2016 fall-back transition is scheduled for January 17, not 24.
+  - Fort Nelson, British Columbia will not fall back on 2015-11-01.  It has
+    effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
+    New zone America/Fort_Nelson.
+
 * Wed Aug 12 2015 Patsy Franklin  - 2015f-1
 - Rebase to 2015f
   - North Korea switches to +0830 on 2015-08-15.

From b39580fcf4f7e46a5651f0eef3982825a1823af5 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Tue, 2 Feb 2016 23:38:48 -0500
Subject: [PATCH 231/280] Resolves: #1302497 - Rebase to 2016a   -
 America/Cayman will not observe daylight saving this year after all.    
 Revert our guess that it would.   - Asia/Chita switches from +0800 to +0900
 on 2016-03-27 at 02:00.   - Asia/Tehran now has DST predictions for the year
 2038 and later,     to be March 21 00:00 to September 21 00:00.  This is
 likely better     than predicting no DST, albeit off by a day every now and
 then.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 41df24b..adeba67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,3 +132,5 @@ noarch/
 /tzdata2015f.tar.gz
 /tzcode2015g.tar.gz
 /tzdata2015g.tar.gz
+/tzcode2016a.tar.gz
+/tzdata2016a.tar.gz
diff --git a/sources b/sources
index e4102e5..f932d87 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-a2c47d908a6426f530efb1393cf1cd06  tzcode2015g.tar.gz
-8d46e8b225b9a04c75f5c39636435ad6  tzdata2015g.tar.gz
+f5e0299925631da7cf82d8ce1205111d  tzcode2016a.tar.gz
+0d3123eb1b453ec0620822bd65be4c42  tzdata2016a.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 1001ccc..c503c00 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2015g
-%define tzdata_version 2015g
-%define tzcode_version 2015g
+Version: 2016a
+%define tzdata_version 2016a
+%define tzcode_version 2016a
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -121,6 +121,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Feb 02 2016 Patsy Franklin  - 2016a-1
+- Rebase to 2016a
+  - America/Cayman will not observe daylight saving this year after all.
+    Revert our guess that it would.
+  - Asia/Chita switches from +0800 to +0900 on 2016-03-27 at 02:00.
+  - Asia/Tehran now has DST predictions for the year 2038 and later,
+    to be March 21 00:00 to September 21 00:00.  This is likely better
+    than predicting no DST, albeit off by a day every now and then.
+ 
 * Mon Oct 05 2015 Patsy Franklin  - 2015g-1
 - Rebase to 2015g
   - Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.

From 55ff361aca9a4321d2968feee65d309612ac8c02 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Tue, 15 Mar 2016 18:40:43 -0400
Subject: [PATCH 232/280] Resolves: #1317720 - Rebase to 2016b   - New zones
 Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and     Ulyanovsk
 Oblasts, Russia, both of which will switch from +03 to +04 on     2016-03-27
 at 02:00 local time.  They need distinct zones since their     post-1970
 histories disagree.  New zone Asia/Barnaul for Altai Krai and     Altai
 Republic, Russia, which will switch from +06 to +07 on the same date     and
 local time.  The Astrakhan change is already official; the others have    
 passed the first reading in the State Duma and are extremely likely.    
 Also, Asia/Sakhalin moves from +10 to +11 on 2016-03-27 at 02:00.   - As a
 trial of a new system that needs less information to be made up,     the new
 zones use numeric time zone abbreviations like "+04"     instead of invented
 abbreviations like "ASTT".   - Haiti will not observe DST in 2016.   -
 Palestine's spring-forward transition on 2016-03-26 is at 01:00, not 00:00.  
   Guess future transitions will be March's last Saturday at 01:00, not
 March's     last Friday at 24:00.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 24 +++++++++++++++++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index adeba67..b482b96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -134,3 +134,5 @@ noarch/
 /tzdata2015g.tar.gz
 /tzcode2016a.tar.gz
 /tzdata2016a.tar.gz
+/tzcode2016b.tar.gz
+/tzdata2016b.tar.gz
diff --git a/sources b/sources
index f932d87..d6e0a9e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-f5e0299925631da7cf82d8ce1205111d  tzcode2016a.tar.gz
-0d3123eb1b453ec0620822bd65be4c42  tzdata2016a.tar.gz
+527e73bc90c70746799d61006bcf038e  tzcode2016b.tar.gz
+f638ec0d4d7a17f001ce475860255c85  tzdata2016b.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index c503c00..af62901 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2016a
-%define tzdata_version 2016a
-%define tzcode_version 2016a
+Version: 2016b
+%define tzdata_version 2016b
+%define tzcode_version 2016b
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -121,6 +121,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Mar 15 2016 Patsy Franklin  - 2016b-1
+- Rebase to 2016b
+  - New zones Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and
+    Ulyanovsk Oblasts, Russia, both of which will switch from +03 to +04 on
+    2016-03-27 at 02:00 local time.  They need distinct zones since their
+    post-1970 histories disagree.  New zone Asia/Barnaul for Altai Krai and
+    Altai Republic, Russia, which will switch from +06 to +07 on the same date
+    and local time.  The Astrakhan change is already official; the others have
+    passed the first reading in the State Duma and are extremely likely.
+    Also, Asia/Sakhalin moves from +10 to +11 on 2016-03-27 at 02:00.
+  - As a trial of a new system that needs less information to be made up,
+    the new zones use numeric time zone abbreviations like "+04"
+    instead of invented abbreviations like "ASTT".
+  - Haiti will not observe DST in 2016.
+  - Palestine's spring-forward transition on 2016-03-26 is at 01:00, not 00:00.
+    Guess future transitions will be March's last Saturday at 01:00, not March's
+    last Friday at 24:00.
+
 * Tue Feb 02 2016 Patsy Franklin  - 2016a-1
 - Rebase to 2016a
   - America/Cayman will not observe daylight saving this year after all.

From df933ab12b7a68a2c0e15752ba664911bf77ed17 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 24 Mar 2016 18:30:52 -0400
Subject: [PATCH 233/280] Resolves: #1320770 - Rebase to 2016c   - Azerbaijan
 no longer observes DST.   - Chile changes from permanent DST to seasonal DST.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b482b96..1b746d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,3 +136,5 @@ noarch/
 /tzdata2016a.tar.gz
 /tzcode2016b.tar.gz
 /tzdata2016b.tar.gz
+/tzdata2016c.tar.gz
+/tzcode2016c.tar.gz
diff --git a/sources b/sources
index d6e0a9e..a9cd94a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-527e73bc90c70746799d61006bcf038e  tzcode2016b.tar.gz
-f638ec0d4d7a17f001ce475860255c85  tzdata2016b.tar.gz
+0330ccd16140d3b6438a18dae9b34b93  tzdata2016c.tar.gz
+ffb82ab0b588138759902b4627a6a80d  tzcode2016c.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index af62901..f877a67 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2016b
-%define tzdata_version 2016b
-%define tzcode_version 2016b
+Version: 2016c
+%define tzdata_version 2016c
+%define tzcode_version 2016c
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -121,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Mar 23 2016 Patsy Franklin  - 2016c-1
+- Rebase to 2016c
+  - Azerbaijan no longer observes DST.
+  - Chile changes from permanent DST to seasonal DST.
+
 * Tue Mar 15 2016 Patsy Franklin  - 2016b-1
 - Rebase to 2016b
   - New zones Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and

From d74410d86ea1257f9dba0f8227d981d6bd0c281c Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Fri, 22 Apr 2016 00:08:16 -0400
Subject: [PATCH 234/280] Resolves: #1328294 - Rebase to 2016d   -
 America/Caracas switches from -0430 to -04 on 2016-05-01 at 02:30.   -
 Asia/Magadan switchefrom +10 to +11 on 2016-04-24 at 02:00.   - New zone
 Asia/Tomsk, split off from Asia/Novosibirsk.  It covers     Tomsk Oblast,
 Russia, which switches from +06 to +07 on 2016-05-29     at 02:00.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 16 ++++++++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b746d4..fcdf3d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,5 @@ noarch/
 /tzdata2016b.tar.gz
 /tzdata2016c.tar.gz
 /tzcode2016c.tar.gz
+/tzcode2016d.tar.gz
+/tzdata2016d.tar.gz
diff --git a/sources b/sources
index a9cd94a..e84d2fa 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-0330ccd16140d3b6438a18dae9b34b93  tzdata2016c.tar.gz
-ffb82ab0b588138759902b4627a6a80d  tzcode2016c.tar.gz
+06fc6fc111cd8dd681abdc5326529afd  tzcode2016d.tar.gz
+14bf84b6c2cdab0a9428991e0150ebe6  tzdata2016d.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index f877a67..c37f3a7 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2016c
-%define tzdata_version 2016c
-%define tzcode_version 2016c
+Version: 2016d
+%define tzdata_version 2016d
+%define tzcode_version 2016d
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -121,7 +121,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
-* Thu Mar 23 2016 Patsy Franklin  - 2016c-1
+* Thu Apr 21 2016 Patsy Franklin  - 2016d-1
+- Rebase to 2016d
+  - America/Caracas switches from -0430 to -04 on 2016-05-01 at 02:30.
+  - Asia/Magadan switchefrom +10 to +11 on 2016-04-24 at 02:00.
+  - New zone Asia/Tomsk, split off from Asia/Novosibirsk.  It covers
+    Tomsk Oblast, Russia, which switches from +06 to +07 on 2016-05-29
+    at 02:00.
+
+* Wed Mar 23 2016 Patsy Franklin  - 2016c-1
 - Rebase to 2016c
   - Azerbaijan no longer observes DST.
   - Chile changes from permanent DST to seasonal DST.

From 0cf26560f9de6a41c0b954b2cb76eefabae4abde Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Sun, 19 Jun 2016 13:37:45 -0400
Subject: [PATCH 235/280] Resolves: #1346658 - Rebase to 2016e   - Africa/Cairo
 starts DST on July 7 24:00 and ends on October 27     at 24:00.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index fcdf3d6..3d80d5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,3 +140,5 @@ noarch/
 /tzcode2016c.tar.gz
 /tzcode2016d.tar.gz
 /tzdata2016d.tar.gz
+/tzdata2016e.tar.gz
+/tzcode2016e.tar.gz
diff --git a/sources b/sources
index e84d2fa..56c5bf9 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-06fc6fc111cd8dd681abdc5326529afd  tzcode2016d.tar.gz
-14bf84b6c2cdab0a9428991e0150ebe6  tzdata2016d.tar.gz
+43f9f929a8baf0dd2f17efaea02c2d2a  tzdata2016e.tar.gz
+6e6d3f0046a9383aafba8c2e0708a3a3  tzcode2016e.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index c37f3a7..cc374f9 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2016d
-%define tzdata_version 2016d
-%define tzcode_version 2016d
+Version: 2016e
+%define tzdata_version 2016e
+%define tzcode_version 2016e
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -121,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Fri Jun 17 2016 Patsy Franklin  - 2016e-1
+- Rebase to 2016e
+  - Africa/Cairo starts DST on July 7 24:00 and ends on October 27
+    at 24:00.
+
 * Thu Apr 21 2016 Patsy Franklin  - 2016d-1
 - Rebase to 2016d
   - America/Caracas switches from -0430 to -04 on 2016-05-01 at 02:30.

From 2ab655297e38c4d201279f075b4f557c7b57bb6e Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 6 Jul 2016 07:17:24 -0400
Subject: [PATCH 236/280] Resolves: #1353123 - Rebase to 2016f   - Egypt
 cancelled DST.   - Asia/Novosibirsk transitions from +06 to +07 on 2016-07-24
 at 02:00.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d80d5d..803ea22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -142,3 +142,5 @@ noarch/
 /tzdata2016d.tar.gz
 /tzdata2016e.tar.gz
 /tzcode2016e.tar.gz
+/tzcode2016f.tar.gz
+/tzdata2016f.tar.gz
diff --git a/sources b/sources
index 56c5bf9..79f20c5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-43f9f929a8baf0dd2f17efaea02c2d2a  tzdata2016e.tar.gz
-6e6d3f0046a9383aafba8c2e0708a3a3  tzcode2016e.tar.gz
+b93618bb84e38dee102e0e41ec9d13e2  tzcode2016f.tar.gz
+b20b3c1618db1984aac685e763de001d  tzdata2016f.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index cc374f9..8e54643 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2016e
-%define tzdata_version 2016e
-%define tzcode_version 2016e
+Version: 2016f
+%define tzdata_version 2016f
+%define tzcode_version 2016f
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -121,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Jul 06 2016 Patsy Franklin  - 2016f-1
+- Rebase to 2016f
+  - Egypt cancelled DST.
+  - Asia/Novosibirsk transitions from +06 to +07 on 2016-07-24 at 02:00.
+
 * Fri Jun 17 2016 Patsy Franklin  - 2016e-1
 - Rebase to 2016e
   - Africa/Cairo starts DST on July 7 24:00 and ends on October 27

From 7c06bbb2a90e9c11012ea38153b6e686aee39827 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Tue, 4 Oct 2016 17:14:49 -0400
Subject: [PATCH 237/280] Resolves: #1380219 - Rebase to 2016g   - Turkey
 permanently switches from +02 to +03 as of 2016-09-07,   - Per IERS Bulletin
 C 52, leap second to be added on 2016-09-31 at 23:59:60.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 803ea22..1303fa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,3 +144,5 @@ noarch/
 /tzcode2016e.tar.gz
 /tzcode2016f.tar.gz
 /tzdata2016f.tar.gz
+/tzdata2016g.tar.gz
+/tzcode2016g.tar.gz
diff --git a/sources b/sources
index 79f20c5..b808c70 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-b93618bb84e38dee102e0e41ec9d13e2  tzcode2016f.tar.gz
-b20b3c1618db1984aac685e763de001d  tzdata2016f.tar.gz
+3c7e97ec8527211104d27cc1d97a23de  tzdata2016g.tar.gz
+f89867013676e3cb9544be2df7d36a91  tzcode2016g.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 8e54643..ac3fcd4 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2016f
-%define tzdata_version 2016f
-%define tzcode_version 2016f
+Version: 2016g
+%define tzdata_version 2016g
+%define tzcode_version 2016g
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -121,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Oct 04 2016 Patsy Franklin  - 2016g-1
+- Rebase to 2016g
+  - Turkey permanently switches from +02 to +03 as of 2016-09-07,
+  - Per IERS Bulletin C 52, leap second to be added on 2016-09-31 at 23:59:60.
+
 * Wed Jul 06 2016 Patsy Franklin  - 2016f-1
 - Rebase to 2016f
   - Egypt cancelled DST.

From c1fb827258771d872f11357af3c13b8837c8abee Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 26 Oct 2016 12:01:28 -0400
Subject: [PATCH 238/280] Resolves: #1387464 - Rebase to 2016h   - DST ends in
 Asia/Gaza and Asia/Hebron on 2016-10-29 at 01:00,     not the predicted date
 of 2016-10-21 at 00:00.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1303fa8..5bfe075 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,3 +146,5 @@ noarch/
 /tzdata2016f.tar.gz
 /tzdata2016g.tar.gz
 /tzcode2016g.tar.gz
+/tzcode2016h.tar.gz
+/tzdata2016h.tar.gz
diff --git a/sources b/sources
index b808c70..f4f40f6 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-3c7e97ec8527211104d27cc1d97a23de  tzdata2016g.tar.gz
-f89867013676e3cb9544be2df7d36a91  tzcode2016g.tar.gz
+00c20689d996dea4cf5b45504724ce8f  tzcode2016h.tar.gz
+878f0ec3fd9e4026ea11dd1b649a315a  tzdata2016h.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index ac3fcd4..d61a28c 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2016g
-%define tzdata_version 2016g
-%define tzcode_version 2016g
+Version: 2016h
+%define tzdata_version 2016h
+%define tzcode_version 2016h
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -121,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Oct 26 2016 Patsy Franklin  - 2016h-1
+- Rebase to 2016h
+  - DST ends in Asia/Gaza and Asia/Hebron on 2016-10-29 at 01:00,
+    not the predicted date of 2016-10-21 at 00:00.
+
 * Tue Oct 04 2016 Patsy Franklin  - 2016g-1
 - Rebase to 2016g
   - Turkey permanently switches from +02 to +03 as of 2016-09-07,

From d9b62bffb98840d9a2821cd2a642744e78dd5d1f Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Fri, 4 Nov 2016 18:17:18 -0400
Subject: [PATCH 239/280] Resolves: #1391315 - Rebase to 2016i   -
 Pacific/Tongatapu now begins DST on 2016-11-06 at 02:00 and ends     on
 2017-01-15 at 03:00.   - Northern Cyprus is changed to +03 year round. This
 results in a     split in Cyprus time zones starting 2016-10-30 at 04:00 and 
    creates a new zone - Asia/Famagusta.   - Antarctica/Casey changed from +08
 to +11 on 2016-10-22.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5bfe075..fb15be8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,3 +148,5 @@ noarch/
 /tzcode2016g.tar.gz
 /tzcode2016h.tar.gz
 /tzdata2016h.tar.gz
+/tzcode2016i.tar.gz
+/tzdata2016i.tar.gz
diff --git a/sources b/sources
index f4f40f6..5ccb9bb 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-00c20689d996dea4cf5b45504724ce8f  tzcode2016h.tar.gz
-878f0ec3fd9e4026ea11dd1b649a315a  tzdata2016h.tar.gz
+8fae14cba9396462955b7859cf04ba48  tzcode2016i.tar.gz
+73912ecfa6a9a8048ddf2e719d9bc39d  tzdata2016i.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index d61a28c..28dbcb5 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2016h
-%define tzdata_version 2016h
-%define tzcode_version 2016h
+Version: 2016i
+%define tzdata_version 2016i
+%define tzcode_version 2016i
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -121,6 +121,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Nov 03 2016 Patsy Franklin  - 2016i-1
+- Rebase to 2016i
+  - Pacific/Tongatapu now begins DST on 2016-11-06 at 02:00 and ends
+    on 2017-01-15 at 03:00.
+  - Northern Cyprus is changed to +03 year round. This results in a
+    split in Cyprus time zones starting 2016-10-30 at 04:00 and
+    creates a new zone - Asia/Famagusta.
+  - Antarctica/Casey changed from +08 to +11 on 2016-10-22.
+
 * Wed Oct 26 2016 Patsy Franklin  - 2016h-1
 - Rebase to 2016h
   - DST ends in Asia/Gaza and Asia/Hebron on 2016-10-29 at 01:00,

From 80cd6b8b076c41f3af89c0e654af0fe6c090eb5d Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 1 Dec 2016 13:03:45 -0500
Subject: [PATCH 240/280] Resolves: #1398047 - Rebase to tzdata-2016j   - The
 Saratov Region of Russia will change from +03 to +04 on     2016-12-04,
 resulting in a new timezone Europe/Saratov.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index fb15be8..30002f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -150,3 +150,5 @@ noarch/
 /tzdata2016h.tar.gz
 /tzcode2016i.tar.gz
 /tzdata2016i.tar.gz
+/tzcode2016j.tar.gz
+/tzdata2016j.tar.gz
diff --git a/sources b/sources
index 5ccb9bb..e2b072b 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-8fae14cba9396462955b7859cf04ba48  tzcode2016i.tar.gz
-73912ecfa6a9a8048ddf2e719d9bc39d  tzdata2016i.tar.gz
+0684b98eb184fab250b6ca946862078d  tzcode2016j.tar.gz
+db361d005ac8b30a2d18c5ca38d3e8ab  tzdata2016j.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 28dbcb5..6fe4311 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2016i
-%define tzdata_version 2016i
-%define tzcode_version 2016i
+Version: 2016j
+%define tzdata_version 2016j
+%define tzcode_version 2016j
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -121,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Dec 01 2016 Patsy Franklin  - 2016j-1
+- Rebase to 2016j
+  - The Saratov Region of Russia is changing from +03 to +04 on
+    2016-12-04, resulting in a new timezone Europe/Saratov.
+
 * Thu Nov 03 2016 Patsy Franklin  - 2016i-1
 - Rebase to 2016i
   - Pacific/Tongatapu now begins DST on 2016-11-06 at 02:00 and ends

From 3727bcd5b8df29b6d9cf73010a450fc128c3e424 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 18 Jan 2017 18:27:50 -0500
Subject: [PATCH 241/280] Resolves: #1414518 - Add zone1970.tab file to the
 list of files to be installed.

---
 tzdata.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tzdata.spec b/tzdata.spec
index 6fe4311..36d61af 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2016j
 %define tzdata_version 2016j
 %define tzcode_version 2016j
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -100,7 +100,7 @@ java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
 rm -fr $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}
 cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir}
-install -p -m 644 zone.tab iso3166.tab $RPM_BUILD_ROOT%{_datadir}/zoneinfo
+install -p -m 644 zone.tab zone1970.tab iso3166.tab $RPM_BUILD_ROOT%{_datadir}/zoneinfo
 cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
 install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
@@ -121,6 +121,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Jan 18 2017 Patsy Franklin  - 2016j-2
+- Add zone1970.tab file.
+  Resolves: #1414518
+
 * Thu Dec 01 2016 Patsy Franklin  - 2016j-1
 - Rebase to 2016j
   - The Saratov Region of Russia is changing from +03 to +04 on

From 4cdab00b08efdf1ecc673a105e676b871269efc8 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher 
Date: Wed, 1 Feb 2017 21:01:21 -0500
Subject: [PATCH 242/280] Add missing %license macro

---
 tzdata.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index 36d61af..09c6a79 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2016j
 %define tzdata_version 2016j
 %define tzcode_version 2016j
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -111,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{_datadir}/zoneinfo
+%license LICENSE
 %doc README
 %doc Theory
 %doc tz-link.html
@@ -121,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Feb 01 2017 Stephen Gallagher  - 2016j-3
+- Add missing %%license macro
+
 * Wed Jan 18 2017 Patsy Franklin  - 2016j-2
 - Add zone1970.tab file.
   Resolves: #1414518

From e50e2c14e36a4f8501f04ec59145ac9fbd5d748b Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Sun, 12 Mar 2017 12:45:59 -0400
Subject: [PATCH 243/280] Resolves: #1431449 Rebase to tzdata-2017a: - Mongolia
 no longer observes DST - The Magallanes region of Chile will go from -04/-03
 to -03 year round,   resulting in a new time zone America/Punta_Arenas.

---
 .gitignore  |  2 ++
 sources     |  8 ++++----
 tzdata.spec | 14 ++++++++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 30002f5..e829718 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,3 +152,5 @@ noarch/
 /tzdata2016i.tar.gz
 /tzcode2016j.tar.gz
 /tzdata2016j.tar.gz
+/tzdata2017a.tar.gz
+/tzcode2017a.tar.gz
diff --git a/sources b/sources
index e2b072b..a3d224d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
-cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
-0684b98eb184fab250b6ca946862078d  tzcode2016j.tar.gz
-db361d005ac8b30a2d18c5ca38d3e8ab  tzdata2016j.tar.gz
+SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
+SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
+SHA512 (tzdata2017a.tar.gz) = fe57930711998a0755749a2bf1b32fdbc9e6ee249762017beea52eae7e521236396300fe2d79298fd81eb6d73fb7567884c35995ed248be06188329d937e3873
+SHA512 (tzcode2017a.tar.gz) = 36d744debd5263b6be39b3a9a146b7db1876f216a4bfc62b46631745861a9c03eda3220f213def86c724d3a11c41398c65c2e5d013ff2c1900e7bfc5e7844025
diff --git a/tzdata.spec b/tzdata.spec
index 09c6a79..26c72a6 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2016j
-%define tzdata_version 2016j
-%define tzcode_version 2016j
-Release: 3%{?dist}
+Version: 2017a
+%define tzdata_version 2017a
+%define tzcode_version 2017a
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -122,6 +122,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Sun Mar 12 2017 Patsy Franklin  - 2017a-1
+- Rebase to tzdata-2017a
+  - Mongolia no longer observes DST
+  - Magallanes region of Chile moves from -04/-03 to -03 year round.
+    This results in a new zone, America/Punta_Arenas.
+
 * Wed Feb 01 2017 Stephen Gallagher  - 2016j-3
 - Add missing %%license macro
 

From 1d1164b40e2790500c7312463c5b7feaca78964d Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Mon, 27 Mar 2017 22:09:08 -0400
Subject: [PATCH 244/280] Resolves: #1434206 - Haiti began observing DST on
 March 12, 2017.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 10 +++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e829718..2e7df3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -154,3 +154,5 @@ noarch/
 /tzdata2016j.tar.gz
 /tzdata2017a.tar.gz
 /tzcode2017a.tar.gz
+/tzcode2017b.tar.gz
+/tzdata2017b.tar.gz
diff --git a/sources b/sources
index a3d224d..422e6ae 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzdata2017a.tar.gz) = fe57930711998a0755749a2bf1b32fdbc9e6ee249762017beea52eae7e521236396300fe2d79298fd81eb6d73fb7567884c35995ed248be06188329d937e3873
-SHA512 (tzcode2017a.tar.gz) = 36d744debd5263b6be39b3a9a146b7db1876f216a4bfc62b46631745861a9c03eda3220f213def86c724d3a11c41398c65c2e5d013ff2c1900e7bfc5e7844025
+SHA512 (tzcode2017b.tar.gz) = 9a73af4b868506d1f6287a8285dea489e68f6828da19509114f9144e2a2019c7fd28f4fb98ea907030d11d011ce3a87d99dbe43bca218beddafff151f0d61df1
+SHA512 (tzdata2017b.tar.gz) = 3e090dba1f52e4c63b4930b28f4bf38b56aabd6728f23094cb5801d10f4e464f17231f17b75b8866714bf98199c166ea840de0787b75b2274aa419a4e14bbc4d
diff --git a/tzdata.spec b/tzdata.spec
index 26c72a6..6dcb346 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2017a
-%define tzdata_version 2017a
-%define tzcode_version 2017a
+Version: 2017b
+%define tzdata_version 2017b
+%define tzcode_version 2017b
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -122,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Sun Mar 26 2017 Patsy Franklin  - 2017b-1
+- Rebase to tzdata-2017b
+  - Haiti began observing DST on March 12, 2017.
+
 * Sun Mar 12 2017 Patsy Franklin  - 2017a-1
 - Rebase to tzdata-2017a
   - Mongolia no longer observes DST

From 4cb88e9dec7850996236a2f7db8a76a58c1b178f Mon Sep 17 00:00:00 2001
From: Release Configuration Management 
Date: Mon, 12 Jun 2017 13:43:27 -0400
Subject: [PATCH 245/280] New branch setup

---
 .gitignore | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e69de29

From 17f52d32b08be06dfa32a6116f099997e72d7b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= 
Date: Wed, 12 Jul 2017 14:22:00 +0200
Subject: [PATCH 246/280] perl dependency renamed to perl-interpreter
 

---
 tzdata.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index 6dcb346..e1e08eb 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -12,7 +12,7 @@ Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
 # Add new patches here...
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gawk, glibc, perl
+BuildRequires: gawk, glibc, perl-interpreter
 BuildRequires: java-devel
 BuildRequires: glibc-common >= 2.5.90-7
 Conflicts: glibc-common <= 2.3.2-63

From 6096fdafe8e127816df685ffddf9eda66b571513 Mon Sep 17 00:00:00 2001
From: Troy Dawson 
Date: Thu, 13 Jul 2017 15:26:47 -0700
Subject: [PATCH 247/280] Resolves: #1434206 - Haiti began observing DST on
 March 12, 2017. fed_hash: 1d1164b40e2790500c7312463c5b7feaca78964d

---
 .gitignore                                    |  158 +++
 ...Ramadan-suspension-commentary-update.patch |   32 +
 ...adan-suspension-now-Sunday-to-Sunday.patch |  102 ++
 001-tzdata-fiji-dst.patch                     |   55 +
 7090844.patch                                 |   44 +
 7133138.patch                                 |   44 +
 javazic-exclusion-fix.patch                   |   42 +
 javazic-fixup.patch                           |   34 +
 rebase-01.patch                               |   37 +
 rebase-02.patch                               |   42 +
 sources                                       |    4 +
 tzdata.spec                                   | 1100 +++++++++++++++++
 12 files changed, 1694 insertions(+)
 create mode 100644 0001-Morocco-Ramadan-suspension-commentary-update.patch
 create mode 100644 0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch
 create mode 100644 001-tzdata-fiji-dst.patch
 create mode 100644 7090844.patch
 create mode 100644 7133138.patch
 create mode 100644 javazic-exclusion-fix.patch
 create mode 100644 javazic-fixup.patch
 create mode 100644 rebase-01.patch
 create mode 100644 rebase-02.patch
 create mode 100644 sources
 create mode 100644 tzdata.spec

diff --git a/.gitignore b/.gitignore
index e69de29..2e7df3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,158 @@
+tzdata-base-0.tar.bz2
+javazic.tar.gz
+tzcode2007j.tar.gz
+tzdata2007j.tar.gz
+tzdata2007k.tar.gz
+tzcode2007k.tar.gz
+tzcode2008a.tar.gz
+tzdata2008b.tar.gz
+tzdata2008c.tar.gz
+tzdata2008d.tar.gz
+tzdata2008e.tar.gz
+tzcode2008e.tar.gz
+tzdata2008f.tar.gz
+tzdata2008g.tar.gz
+tzcode2008g.tar.gz
+tzdata2008h.tar.gz
+tzcode2008h.tar.gz
+tzdata2008i.tar.gz
+tzdata2009a.tar.gz
+tzcode2009a.tar.gz
+tzdata2009d.tar.gz
+tzcode2009d.tar.gz
+tzdata2009e.tar.gz
+tzcode2009e.tar.gz
+tzdata2009f.tar.gz
+tzdata2009h.tar.gz
+tzcode2009h.tar.gz
+tzdata2009i.tar.gz
+tzcode2009i.tar.gz
+tzdata2009j.tar.gz
+tzdata2009k.tar.gz
+tzcode2009k.tar.gz
+tzdata2009m.tar.gz
+tzdata2009u.tar.gz
+tzcode2009t.tar.gz
+tzdata2010c.tar.gz
+tzcode2010c.tar.gz
+tzdata2010e.tar.gz
+tzcode2010f.tar.gz
+tzdata2010f.tar.gz
+tzdata2010h.tar.gz
+tzdata2010i.tar.gz
+tzdata2010j.tar.gz
+tzcode2010j.tar.gz
+tzdata2010k.tar.gz
+tzcode2010k.tar.gz
+tzcode2010l.tar.gz
+tzdata2010l.tar.gz
+/tzdata2010n.tar.gz
+/tzcode2010n.tar.gz
+/tzdata2010o.tar.gz
+/tzdata2011a.tar.gz
+/tzcode2011a.tar.gz
+/tzdata2011b.tar.gz
+/tzcode2011b.tar.gz
+tzdata/
+/tzdata-*/
+*.rpm
+/tzdata2011d.tar.gz
+/tzcode2011d.tar.gz
+/tzdata2011f.tar.gz
+/tzcode2011e.tar.gz
+/tzdata2011g.tar.gz
+/tzcode2011g.tar.gz
+noarch/
+.build-*
+/tzdata2011h.tar.gz
+/tzdata2011i.tar.gz
+/tzcode2011i.tar.gz
+/tzdata2011j.tar.gz
+/tzdata2011l.tar.gz
+/tzdata2011n.tar.gz
+/tzdata2012b.tar.gz
+/tzcode2012b.tar.gz
+/tzdata2012c.tar.gz
+/tzcode2012c.tar.gz
+/tzdata2012d.tar.gz
+/tzdata2012e.tar.gz
+/tzcode2012e.tar.gz
+/tzdata2012f.tar.gz
+/tzcode2012f.tar.gz
+/tzdata2012g.tar.gz
+/tzcode2012g.tar.gz
+/tzdata2012h.tar.gz
+/tzcode2012h.tar.gz
+/tzdata2012i.tar.gz
+/tzcode2012i.tar.gz
+/tzdata2012j.tar.gz
+/tzcode2012j.tar.gz
+/tzdata2013b.tar.gz
+/tzcode2013b.tar.gz
+/tzdata2013c.tar.gz
+/tzcode2013c.tar.gz
+/tzdata2013d.tar.gz
+/tzcode2013d.tar.gz
+/tzdata2013g.tar.gz
+/tzcode2013g.tar.gz
+/tzcode2013h.tar.gz
+/tzdata2013h.tar.gz
+/tzcode2013i.tar.gz
+/tzdata2013i.tar.gz
+/tzdata2014a.tar.gz
+/tzcode2014a.tar.gz
+/tzcode2014b.tar.gz
+/tzdata2014b.tar.gz
+/tzcode2014c.tar.gz
+/tzdata2014c.tar.gz
+/javazic-1.8-37392f2f5d59.tar.xz
+/tzcode2014e.tar.gz
+/tzdata2014e.tar.gz
+/tzcode2014f.tar.gz
+/tzdata2014f.tar.gz
+/tzcode2014g.tar.gz
+/tzdata2014g.tar.gz
+/tzcode2014h.tar.gz
+/tzdata2014h.tar.gz
+/tzcode2014i.tar.gz
+/tzdata2014i.tar.gz
+/tzcode2014j.tar.gz
+/tzdata2014j.tar.gz
+/tzdata2015a.tar.gz
+/tzcode2015a.tar.gz
+/tzdata2015b.tar.gz
+/tzcode2015b.tar.gz
+/tzcode2015c.tar.gz
+/tzdata2015c.tar.gz
+/tzcode2015d.tar.gz
+/tzdata2015d.tar.gz
+/tzcode2015e.tar.gz
+/tzdata2015e.tar.gz
+/tzcode2015f.tar.gz
+/tzdata2015f.tar.gz
+/tzcode2015g.tar.gz
+/tzdata2015g.tar.gz
+/tzcode2016a.tar.gz
+/tzdata2016a.tar.gz
+/tzcode2016b.tar.gz
+/tzdata2016b.tar.gz
+/tzdata2016c.tar.gz
+/tzcode2016c.tar.gz
+/tzcode2016d.tar.gz
+/tzdata2016d.tar.gz
+/tzdata2016e.tar.gz
+/tzcode2016e.tar.gz
+/tzcode2016f.tar.gz
+/tzdata2016f.tar.gz
+/tzdata2016g.tar.gz
+/tzcode2016g.tar.gz
+/tzcode2016h.tar.gz
+/tzdata2016h.tar.gz
+/tzcode2016i.tar.gz
+/tzdata2016i.tar.gz
+/tzcode2016j.tar.gz
+/tzdata2016j.tar.gz
+/tzdata2017a.tar.gz
+/tzcode2017a.tar.gz
+/tzcode2017b.tar.gz
+/tzdata2017b.tar.gz
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/001-tzdata-fiji-dst.patch b/001-tzdata-fiji-dst.patch
new file mode 100644
index 0000000..cdbd96f
--- /dev/null
+++ b/001-tzdata-fiji-dst.patch
@@ -0,0 +1,55 @@
+diff -Nrup a/australasia b/australasia
+--- a/australasia	2013-12-17 10:26:04.000000000 -0500
++++ b/australasia	2014-01-21 11:37:08.135130460 -0500
+@@ -354,16 +354,18 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
+ # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
+ 
+ # From the Fijian Government Media Center (2013-08-30) via David Wheeler:
+-# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am
+-# on Sunday 19th January, 2014....  move clocks forward by one hour from 2am
++# Fiji will start daylight savings on Sunday 27th October, 2013 ...
++# move clocks forward by one hour from 2am
+ # http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
+-#
+-# From Paul Eggert (2013-09-09):
++
++# From Steffen Thorsen (2013-01-10):
++# Fiji will end DST on 2014-01-19 02:00:
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
++
++# From Paul Eggert (2014-10-10):
+ # For now, guess that Fiji springs forward the Sunday before the fourth
+-# Monday in October.  This matches both recent practice and
+-# timeanddate.com's current spring-forward prediction.
+-# For the January 2014 transition we guessed right while timeanddate.com
+-# guessed wrong, so leave the fall-back prediction alone.
++# Monday in October, and springs back the penultimate Sunday in January.
++# This is ad hoc, but matches recent practice.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
+@@ -372,7 +374,8 @@ Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
+ Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
+ Rule	Fiji	2010	max	-	Oct	Sun>=21	2:00	1:00	S
+ Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
+-Rule	Fiji	2012	max	-	Jan	Sun>=18	3:00	0	-
++Rule    Fiji    2012    2013    -    Jan    Sun>=18    3:00    0    -
++Rule    Fiji    2014    max    -    Jan    Sun>=18    2:00    0    -
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26	# Suva
+ 			12:00	Fiji	FJ%sT	# Fiji Time
+diff -Nrup a/NEWS b/NEWS
+--- a/NEWS	2013-12-17 10:26:04.000000000 -0500
++++ b/NEWS	2014-01-21 11:37:08.136130469 -0500
+@@ -13,6 +13,11 @@ Release 2013i - 2013-12-17 07:25:23 -080
+     In 2004, Cuba began DST on March 28, not April 4.
+     (Thanks to Steffen Thorsen.)
+ 
++  Changes affecting near-future time stamps
++
++    Fiji ends DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00.
++    (Thanks to Steffen Thorsen.)
++
+   Changes affecting code
+ 
+     The compile-time flag NOSOLAR has been removed, as nowadays the
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/javazic-exclusion-fix.patch b/javazic-exclusion-fix.patch
new file mode 100644
index 0000000..b9dfa4b
--- /dev/null
+++ b/javazic-exclusion-fix.patch
@@ -0,0 +1,42 @@
+# Patch based on fix in JDK8 tree by Yuka Kamiya from Oracle:
+# http://hg.openjdk.java.net/jdk8/tl/jdk/rev/f114bddac6d6
+
+diff -up ./sun/tools/javazic/Mappings.java.sav ./sun/tools/javazic/Mappings.java
+--- ./sun/tools/javazic/Mappings.java.sav	2011-11-03 16:31:53.000000000 -0400
++++ ./sun/tools/javazic/Mappings.java	2011-11-03 16:41:44.000000000 -0400
+@@ -77,15 +77,17 @@ class Mappings {
+ 	    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.
+-	    if (zone.size() > 1) {
+-		ZoneRec zrec = zone.get(zone.size()-2);
++	    boolean isExcluded = false;
++	    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) {
+ 			excludeList = new ArrayList();
+ 		    }
+ 		    excludeList.add(zone.getName());
+-		    continue;
++		    isExcluded = true;
++		    break;
+ 		}
+ 	    }
+ 
+@@ -101,9 +103,13 @@ class Mappings {
+ 		rawOffsetsIndex.add(i, rawOffset);
+ 
+ 		Set perRawOffset = new TreeSet();
++		if (!isExcluded) {
++		    perRawOffset = new TreeSet();
++		}
++
+ 		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/javazic-fixup.patch b/javazic-fixup.patch
new file mode 100644
index 0000000..8b19ef4
--- /dev/null
+++ b/javazic-fixup.patch
@@ -0,0 +1,34 @@
+--- sun/util/calendar/LocalGregorianCalendar.java.keiths	2007-09-07 14:48:19.000000000 -0700
++++ sun/util/calendar/LocalGregorianCalendar.java	2007-09-07 14:52:58.000000000 -0700
+@@ -120,8 +120,7 @@ public class LocalGregorianCalendar exte
+     static LocalGregorianCalendar getLocalGregorianCalendar(String name) {
+ 	Properties calendarProps = null;
+ 	try {
+-	    String homeDir = (String) AccessController.doPrivileged(
+-				new sun.security.action.GetPropertyAction("java.home"));
++  	    String homeDir = (String) System.getProperty("java.home");
+ 	    final String fname = homeDir + File.separator + "lib" + File.separator
+ 				 + "calendars.properties";
+ 	    calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() {
+--- sun/util/calendar/ZoneInfoFile.java.keiths	2007-09-07 14:54:58.000000000 -0700
++++ sun/util/calendar/ZoneInfoFile.java	2007-09-07 14:55:36.000000000 -0700
+@@ -1021,8 +1021,7 @@ public class ZoneInfoFile {
+ 	byte[] buffer = null;
+ 
+ 	try {
+-	    String zi_dir = (String) AccessController.doPrivileged(
+-			        new sun.security.action.GetPropertyAction("user.zoneinfo.dir"));
++	    String zi_dir = (String) System.getProperty("user.zoneinfo.dir");
+ 	    File dir = null;
+ 	    if (zi_dir != null)
+ 	      dir = new File(zi_dir);
+@@ -1035,8 +1034,7 @@ public class ZoneInfoFile {
+ 	    }
+ 
+ 	    if (dir == null) {
+-	      String homeDir = (String) AccessController.doPrivileged(
+-				new sun.security.action.GetPropertyAction("java.home"));
++	      String homeDir = (String) System.getProperty("java.home");
+ 	      zi_dir = homeDir + File.separator + "lib" + File.separator
+ 		+ "zi";
+ 	    }
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
new file mode 100644
index 0000000..a3c97fc
--- /dev/null
+++ b/sources
@@ -0,0 +1,4 @@
+6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
+cfc79fbbb17f21052d3dd7634ec70bea  javazic-1.8-37392f2f5d59.tar.xz
+afaf15deb13759e8b543d86350385b16  tzcode2017b.tar.gz
+50dc0dc50c68644c1f70804f2e7a1625  tzdata2017b.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
new file mode 100644
index 0000000..6dcb346
--- /dev/null
+++ b/tzdata.spec
@@ -0,0 +1,1100 @@
+Summary: Timezone data
+Name: tzdata
+Version: 2017b
+%define tzdata_version 2017b
+%define tzcode_version 2017b
+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
+# Add new patches here...
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: gawk, glibc, perl
+BuildRequires: java-devel
+BuildRequires: glibc-common >= 2.5.90-7
+Conflicts: glibc-common <= 2.3.2-63
+BuildArchitectures: noarch
+
+%description
+This package contains data files with rules for various timezones around
+the world.
+
+%package java
+Summary: Timezone data for Java
+Group: System Environment/Base
+Source3: javazic.tar.gz
+Source4: javazic-1.8-37392f2f5d59.tar.xz
+Patch100: javazic-fixup.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.
+
+%prep
+%setup -q -c -a 1
+
+# Add new patches here...
+
+mkdir javazic
+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
+# for creating the zoneinfo files, rebase all the packages
+# from "sun." to "rht.". Unfortunately, gcj does not support
+# any of the -Xclasspath options, so we must go this route
+# to ensure the greatest compatibility.
+mv sun rht
+find . -type f -name '*.java' -print0 \
+    | xargs -0 -- sed -i -e 's:sun\.tools\.:rht.tools.:g' \
+                         -e 's:sun\.util\.:rht.util.:g'
+popd
+
+tar xf %{SOURCE4}
+
+echo "%{name}%{tzdata_version}" >> VERSION
+
+%build
+FILES="africa antarctica asia australasia europe northamerica southamerica
+       pacificnew etcetera backward"
+
+mkdir zoneinfo/{,posix,right}
+zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
+zic -y ./yearistype -d zoneinfo/posix -L /dev/null $FILES
+zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
+
+grep -v tz-art.htm tz-link.htm > tz-link.html
+
+# Java 6/7 tzdata
+pushd javazic
+javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
+popd
+
+java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
+  -d javazi \
+  $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
+
+# Java 8 tzdata
+pushd javazic-1.8
+javac -source 1.7 -target 1.7 -classpath . `find . -name \*.java`
+popd
+
+java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
+    -srcdir . -dstfile tzdb.dat \
+    -verbose \
+    $FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
+
+%install
+rm -fr $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_datadir}
+cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir}
+install -p -m 644 zone.tab zone1970.tab iso3166.tab $RPM_BUILD_ROOT%{_datadir}/zoneinfo
+cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
+install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_datadir}/zoneinfo
+%license LICENSE
+%doc README
+%doc Theory
+%doc tz-link.html
+
+%files java
+%defattr(-,root,root)
+%{_datadir}/javazi
+%{_datadir}/javazi-1.8
+
+%changelog
+* Sun Mar 26 2017 Patsy Franklin  - 2017b-1
+- Rebase to tzdata-2017b
+  - Haiti began observing DST on March 12, 2017.
+
+* Sun Mar 12 2017 Patsy Franklin  - 2017a-1
+- Rebase to tzdata-2017a
+  - Mongolia no longer observes DST
+  - Magallanes region of Chile moves from -04/-03 to -03 year round.
+    This results in a new zone, America/Punta_Arenas.
+
+* Wed Feb 01 2017 Stephen Gallagher  - 2016j-3
+- Add missing %%license macro
+
+* Wed Jan 18 2017 Patsy Franklin  - 2016j-2
+- Add zone1970.tab file.
+  Resolves: #1414518
+
+* Thu Dec 01 2016 Patsy Franklin  - 2016j-1
+- Rebase to 2016j
+  - The Saratov Region of Russia is changing from +03 to +04 on
+    2016-12-04, resulting in a new timezone Europe/Saratov.
+
+* Thu Nov 03 2016 Patsy Franklin  - 2016i-1
+- Rebase to 2016i
+  - Pacific/Tongatapu now begins DST on 2016-11-06 at 02:00 and ends
+    on 2017-01-15 at 03:00.
+  - Northern Cyprus is changed to +03 year round. This results in a
+    split in Cyprus time zones starting 2016-10-30 at 04:00 and
+    creates a new zone - Asia/Famagusta.
+  - Antarctica/Casey changed from +08 to +11 on 2016-10-22.
+
+* Wed Oct 26 2016 Patsy Franklin  - 2016h-1
+- Rebase to 2016h
+  - DST ends in Asia/Gaza and Asia/Hebron on 2016-10-29 at 01:00,
+    not the predicted date of 2016-10-21 at 00:00.
+
+* Tue Oct 04 2016 Patsy Franklin  - 2016g-1
+- Rebase to 2016g
+  - Turkey permanently switches from +02 to +03 as of 2016-09-07,
+  - Per IERS Bulletin C 52, leap second to be added on 2016-09-31 at 23:59:60.
+
+* Wed Jul 06 2016 Patsy Franklin  - 2016f-1
+- Rebase to 2016f
+  - Egypt cancelled DST.
+  - Asia/Novosibirsk transitions from +06 to +07 on 2016-07-24 at 02:00.
+
+* Fri Jun 17 2016 Patsy Franklin  - 2016e-1
+- Rebase to 2016e
+  - Africa/Cairo starts DST on July 7 24:00 and ends on October 27
+    at 24:00.
+
+* Thu Apr 21 2016 Patsy Franklin  - 2016d-1
+- Rebase to 2016d
+  - America/Caracas switches from -0430 to -04 on 2016-05-01 at 02:30.
+  - Asia/Magadan switchefrom +10 to +11 on 2016-04-24 at 02:00.
+  - New zone Asia/Tomsk, split off from Asia/Novosibirsk.  It covers
+    Tomsk Oblast, Russia, which switches from +06 to +07 on 2016-05-29
+    at 02:00.
+
+* Wed Mar 23 2016 Patsy Franklin  - 2016c-1
+- Rebase to 2016c
+  - Azerbaijan no longer observes DST.
+  - Chile changes from permanent DST to seasonal DST.
+
+* Tue Mar 15 2016 Patsy Franklin  - 2016b-1
+- Rebase to 2016b
+  - New zones Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and
+    Ulyanovsk Oblasts, Russia, both of which will switch from +03 to +04 on
+    2016-03-27 at 02:00 local time.  They need distinct zones since their
+    post-1970 histories disagree.  New zone Asia/Barnaul for Altai Krai and
+    Altai Republic, Russia, which will switch from +06 to +07 on the same date
+    and local time.  The Astrakhan change is already official; the others have
+    passed the first reading in the State Duma and are extremely likely.
+    Also, Asia/Sakhalin moves from +10 to +11 on 2016-03-27 at 02:00.
+  - As a trial of a new system that needs less information to be made up,
+    the new zones use numeric time zone abbreviations like "+04"
+    instead of invented abbreviations like "ASTT".
+  - Haiti will not observe DST in 2016.
+  - Palestine's spring-forward transition on 2016-03-26 is at 01:00, not 00:00.
+    Guess future transitions will be March's last Saturday at 01:00, not March's
+    last Friday at 24:00.
+
+* Tue Feb 02 2016 Patsy Franklin  - 2016a-1
+- Rebase to 2016a
+  - America/Cayman will not observe daylight saving this year after all.
+    Revert our guess that it would.
+  - Asia/Chita switches from +0800 to +0900 on 2016-03-27 at 02:00.
+  - Asia/Tehran now has DST predictions for the year 2038 and later,
+    to be March 21 00:00 to September 21 00:00.  This is likely better
+    than predicting no DST, albeit off by a day every now and then.
+ 
+* Mon Oct 05 2015 Patsy Franklin  - 2015g-1
+- Rebase to 2015g
+  - Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.
+  - Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.
+  - Fiji's 2016 fall-back transition is scheduled for January 17, not 24.
+  - Fort Nelson, British Columbia will not fall back on 2015-11-01.  It has
+    effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
+    New zone America/Fort_Nelson.
+
+* Wed Aug 12 2015 Patsy Franklin  - 2015f-1
+- Rebase to 2015f
+  - North Korea switches to +0830 on 2015-08-15.
+    The abbreviation remains "KST".
+  - Uruguay no longer observes DST.
+
+* Fri Jun 19 2015 Patsy Franklin  - 2015e-1
+- 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.
+- Assume Cayman Islands will observe DST starting next year, using US rules.
+  Although it isn't guaranteed, it is the most likely.
+
+* Fri Jun 19 2015 Fedora Release Engineering  - 2015d-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* 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
+    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,
+    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
+    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.
+  - 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
+    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.
+  - 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.
+
+* 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
+  - 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.
+
+* Tue Jun 17 2014 Patsy Franklin  - 2014e-3
+- Rebase to 2014e
+  - Morrocco suspends DTS for Ramadan
+       June 28 at 03:00 and August 2 at 02:00
+  - Egypt suspends DTS for Ramadan
+       June 26 and July 31 at 24:00
+- Additional edit to support OpenJDK8. (#1091029)
+
+* Sun Jun 08 2014 Fedora Release Engineering  - 2014c-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed May 28 2014 Patsy Franklin  2014c-2
+- Add support for new tzdata file format used by OpenJDK8.
+
+* Wed May 14 2014 Patsy Franklin  2014c-1
+- Rebase to 2014c
+  -Egypt will re-apply DST on May 15 at 24:00, except that DST
+   will not be observed during Ramadan.
+
+* Wed Mar 26 2014 Patsy Franklin  2014b-1
+- Rebase to 2014b
+  - Crimea changes to Moscow time on March 30, 2014.
+
+* Wed Mar 12 2014 Patsy Franklin  2014a-1
+- Rebase to 2014a
+  - Turkey begins DST on 2014-03-31, not 03-30.
+
+* Tue Jan 21 2014 Patsy Franklin  2013i-2
+- Fiji ends DST on 2014-01-19 at 02:00, not the previously scheduled 03:00.
+
+* Wed Dec 18 2013 Patsy Franklin  2013i-1
+- Rebase with early release of 2013i from Paul Eggert github.
+  - Jordan switches back to standard time at 00:00 on December 20,2013.
+  - The 2006-2011 transition schedule is planned to resume in 2014.
+  - The compile-time flag NOSOLAR has been removed.
+  - The files solar87, solar88, and solar89 are no longer distributed.
+  - tz-link.htm now mentions Noda Time.
+
+* Wed Oct 30 2013 Patsy Franklin  2013h-1
+- Rebase to 2013h 
+  - Lybia switched to using UTC+2 without DST
+  - Western Sahara (Africa/ElAaiun) uses Morocco's DST rules
+  - Acres and Amazon swithc to UTC-4 and UTC-5 on 2013-11-10
+  - Add entries for DST transition in Morocco in the year 2038
+ 
+* Thu Oct  3 2013 Patsy Franklin  2013g-1
+- Morocco moved end of DST from September to October.  Rebase to
+  pick up the Morocco DST change.
+
+* 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
+  (0001-Adjust-commentary-to-try-to-defuse-recent-issues-som.patch)
+- Update local mean time for Jerusalem to match more-precise longitude
+  (0002-asia-Asia-Jerusalem-Fix-LMT-to-match-more-precise-lo.patch)
+- Move Morocco's midsummer 2013 transitions
+  (0003-Move-Morocco-s-midsummer-2013-transitions.patch)
+- Israel now falls back on the last Sunday of October
+  (0004-Israel-now-falls-back-on-the-last-Sunday-of-October.patch)
+
+* Fri May 17 2013 Petr Machata  - 2013c-1
+- Upstream 2013c
+  - Sync past stamps for Palestine and West Bank with timeanddate.com
+  - Assume that the recent change to Paraguay's DST rules is permanent
+  - Macquarie was uninhabited between 1919 and 1948.  It's also part
+    of Australia (update in zone.tab).
+
+* Wed Mar 27 2013 Petr Machata  - 2013b-2
+- Palestine starts Daylight Saving Time on March 29, 2013
+  (tzdata-2013b-gaza.patch)
+
+* Wed Mar 13 2013 Petr Machata  - 2013b-1
+- Upstream 2013b
+  - Paraguay will end DST on March 24 this year
+  - Haiti uses US daylight-saving rules this year
+  - Morocco does not observe DST during Ramadan
+- Upstream 2013a
+  - Retire Chile patch, 2013a has the data
+  - New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen
+  - Many changes in historical timestamps
+
+* Wed Feb 27 2013 Petr Machata  - 2012j-3
+- DTS in Chile will end on 2013-04-28
+  (0016-Chile-is-changing-its-DST-rules.patch)
+
+* Fri Feb 15 2013 Fedora Release Engineering  - 2012j-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Nov 30 2012 Petr Machata  - 2012j-1
+- Upstream 2012j
+  - Libya moved to CET
+
+* Tue Nov  6 2012 Petr Machata  - 2012i-2
+- Preserve hardlinks that zic leaves behind, install with cp -d
+
+* Mon Nov  5 2012 Petr Machata  - 2012i-1
+- Upstream 2012i
+  - Cuba switched to DST
+
+* Mon Nov  5 2012 Petr Machata  - 2012h-2
+- Switch back to using system zic, ignore upstream Makefile at all.
+  We do so for java anyway.
+- Drop Factory from distribution
+
+* Wed Oct 31 2012 Petr Machata  - 2012h-1
+- Upstream 2012h
+  - Brazilian state Bahia no longer has DST.
+  - Brazilian state Tocantins now has DST.
+  - Israel has new DST rules next year.
+  - Jordan stays on DST this winter.
+
+* Mon Oct 22 2012 Petr Machata  - 2012g-1
+- Upstream 2012g
+  - Adjust the packaging for new Makefile
+  - Palestine: Fall transition was Sep 21, not Sep 28
+  - Samoa: Daylight Saving Time commences on Sunday 30th September
+    2012 and ends on Sunday 7th of April 2013.
+- Resolves: #868173
+
+* Mon Sep 17 2012 Petr Machata  - 2012f-1
+- Fiji will start daylight savings at 2 am on Sunday 21st October 2012
+  and end at 3 am on Sunday 20th January 2013.  Guess it will be like
+  that in following years as well.
+- Resolves: #857231
+
+* Mon Aug 13 2012 Petr Machata  - 2012e-1
+- Tokelau is in time zone UTC+13, not UTC+14 (and always was)
+
+* Fri Jul 20 2012 Petr Machata  - 2012d-1
+- Upstream 2012d
+  - Morocco will not observe DST during the month of Ramadan.
+    DST cessation end date was corrected.
+
+* Fri Jul 13 2012 Petr Machata  - 2012c-2
+- Morocco will not observe DST during the month of Ramadan
+  (tzdata-2012c-morocco.patch)
+
+* Mon Apr  2 2012 Petr Machata  - 2012c-1
+- Upstream 2012c
+  - Haiti observes DST from 2012 on
+  - Gaza Strip and Hebron observe DST in 2012
+  - Change start of DST in Syria to last Friday in March
+
+* Fri Mar 16 2012 Petr Machata  - 2012b-3
+- Morocco moved DST entry to last Sunday of April
+
+* Thu Mar 15 2012 Petr Machata  - 2012b-2
+- Morocco DST starts on the last Sunday of March (March 25, 2012) and
+  ends on last Sunday of September, except the month of Ramadan.  It
+  is currently unclear what that Ramadan bit means, so this is not
+  covered by the patch as of now.
+
+* Tue Mar  6 2012 Petr Machata  - 2012b-1
+- Rebase to 2012b; changes vs. 2011n-5:
+  - Changes to zones for Antarctica stations
+  - Armenia abolished DST in 2012 and forward
+  - Cuba enters DST on 31st March
+  - Falkland Islands will stay on permanent Summer Time
+  - New zone for Creston Valley, Canada, which differs from Dawson
+    Creek in past stamps.  Changes to historical stamps in Canada.
+  - Last year, Tokelau skipped over the date line together with Samoa
+
+* Fri Feb 24 2012 Petr Machata  - 2011n-5
+- Add a patch for change in Chilean DST
+- Update URLs
+
+* Tue Feb 21 2012 Petr Machata  - 2011n-4
+- Add a patch for the leap second that will occur this summer
+
+* Sat Jan 14 2012 Fedora Release Engineering  - 2011n-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Nov  3 2011 Petr Machata  - 2011n-2
+- Fix building of Java zones.  Patch by Deepak Bhole
+
+* Mon Oct 31 2011 Petr Machata  - 2011l-1
+- Rebase to 2011n
+  - Drop all patches, including the Kemerovo patch, which is not in
+    upstream
+  - Cuba postponed DST by two weeks to Nov 13
+  - Fiji will enter DST on Jan 21
+- Resolved: #748778
+
+* Wed Oct 19 2011 Petr Machata  - 2011l-3
+- Ukraine will enter Winter Time after all
+
+* Fri Oct 14 2011 Petr Machata  - 2011l-2
+- State of Bahia, Brazil, to resume Summer Time on Oct 16
+- The project moved, reflect this in URL
+- Resolves: #746183
+
+* Tue Oct 11 2011 Petr Machata  - 2011l-1
+- Upstream 2011l:
+  - Fix ancient stamps for America/Sitka
+  - Asia/Hebron transitioned to standard time already on Sep 30, not Oct 3
+  - Fiji will introduce DST on Oct 22
+
+* Wed Sep 21 2011 Petr Machata  - 2011k-0.1.20110921
+- Upstream 2011j:
+  - Fix the Samoa date line skip
+  - Changes in past timestamp typos several Africa zones
+- Proposed upstream 2011k:
+  - Belarus and Ukraine adopt permanent DST in 2011
+  - Palestine suspends DST during Ramadan in 2011
+  - Gaza and West Bank split in 2011.  West Bank is tracked in the
+    timezone Asia/Hebron.  zone.tab update accordingly.
+- Resolves: #737896
+
+* Mon Aug 29 2011 Petr Machata  - 2011h-1
+- Upstream 2011i:
+  - Add Africa/Juba (South Sudan) zone
+  - Samoa skips over the date line on 2011-12-30
+  - Use KALT as abbreviation for Europe/Kalinigrad
+  - Canonical version of the Newfoundland patch
+  - Change America/Resolute use of EST to 2006-2007 only
+  - Assume Metlakatla abandoned use of daylight saving in 1983
+  - Sync iso3166.tab and zone.tab with above
+- Resolved: #734063
+
+* Wed Aug 10 2011 Petr Machata  - 2011h-2
+- Patch for upcoming change in Newfoundland.  The transition time
+  changes from 12:01 AM to 2:00 AM.
+
+* Mon Jun 27 2011 Petr Machata  - 2011h-1
+- Upstream 2011h:
+  - Russia abandons DST in 2011.
+  - *.tab: change AN (Netherlands Antilles) to CW (Curacao)
+
+* Tue Apr 26 2011 Petr Machata  - 2011g-1
+- Upstream 2011e:
+  - Morocco introduced DST for 2011 from April 2 to July 31.
+  - Delay end of DST in Chile in 2011 until May 7.
+- Upstream 2011f:
+  - The Falkland Islands will not turn back clocks this winter, but
+    stay on daylight saving time.
+- Upstream 2011g:
+  - Egypt abandons DST in 2011 (and forward)
+- Dropped tzdata-2011d-chile.patch
+- Dropped tzdata-2011d-morocco.patch
+
+* Wed Mar 30 2011 Petr Machata  - 2011d-3
+- Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch)
+
+* Tue Mar 29 2011 Petr Machata  - 2011d-2
+- Delay end of DST in Chile in 2011 until May 7. (tzdata-2011d-chile.patch)
+
+* Tue Mar 15 2011 Petr Machata  - 2011d-1
+- Upstream 2011d:
+  - Change end of DST in Samoa in 2011.
+  - Change start of DST in Cuba in 2011.
+  - Move start of DST in Turkey by one day in 2011.
+- Dropped tzdata-2011b-c.patch
+
+* Fri Mar 04 2011 Petr Machata  - 2011b-3
+- Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)
+
+* Thu Mar 03 2011 Petr Machata  - 2011b-2
+- Update of historical stamps for Juneau, Sitka, and histcurrent stamps
+  for Metlakatla.  Sitka and Metlakatla are new zones.
+- Delay end of DST in Chile in 2011 until first Sunday in April. (tzdata-2011b-c.patch)
+
+* Wed Feb 09 2011 Petr Machata  - 2011b-1
+- Upstream 2011b:
+  - America/North_Dakota/Beulah: Mercer County, North Dakota, changed
+    from the mountain time zone to the central time zone
+
+* Mon Jan 24 2011 Petr Machata  - 2011a-1
+- Upstream 2011a:
+  - Updates of historical stamps for Hawaii
+
+* Tue Nov 09 2010 Petr Machata  - 2010o-1
+- Upstream 2010o:
+  - Fiji will end DST on March 6, 2011, not March 27, 2011
+
+* Wed Oct 27 2010 Petr Machata  - 2010n-1
+- Upstream 2010m:
+  - Hong Kong didn't observe DST in 1977
+  - In zone.tab, remove obsolete association of Vostok Station with
+    South Magnetic Pole; add association with Lake Vostok
+- Upstream 2010n:
+  - Change end of DST in Samoa in 2011 from 2011-04-03 0:00 to
+    2011-04-03 1:00
+
+* Mon Aug 16 2010 Petr Machata  - 2010l-2
+- Upstream 2010l:
+  - Change Cairo's 2010 reversion to DST from the midnight between
+    September 8 and 9 to the midnight between September 9 and 10.
+  - Change Gaza's 2010 return to standard time to the midnight between
+    August 10 and 11.
+  - Bahia de Banderas (Mexican state of Nayarit) changed time zone
+    UTC-7 to new time zone UTC-6 on April 4, 2010
+
+* Tue Aug  3 2010 Tom "spot" Callaway  - 2010k-1
+- Upstream 2010k:
+ - Egypt has announced that DST will be off during Ramadan, but
+   DST will resume afterwards (August 10, 2010 - September 9, 2010)
+
+* Tue May 11 2010 Petr Machata  - 2010j-1
+- Upstream 2010j:
+  - Bahia de Banderas (Mexican state of Nayarit) changed time zone
+    UTC-7 to new time zone UTC-6 on April 4, 2010
+
+* Mon Apr 19 2010 Petr Machata  - 2010i-1
+- Upstream 2010i:
+  - Morocco will have DST from 2010-05-02 to 2010-08-08
+  - San Luis, Argentina will keep permanent DST after April 11, 2010
+  - Updates of historical stamps for Taiwan
+
+* Tue Apr 06 2010 Petr Machata  - 2010h-2
+- Upstream 2010g:
+  - No Bangladesh DST in 2010 and forward.
+  - Gaza DST starts last Saturday in March at 12:01 a.m. in 2010 and forward
+  - Kamchatka and Anadyr change to Moscow+8 on 2010-03-28
+  - Samara changes to Moscow+0 on 2010-03-28
+  - Related zone.tab updates
+- Upstream 2010h:
+  - No DST in Tunisia in 2010 and forward
+  - No DST in Pakistan in 2010 and forward
+- Dropped tzdata-2010g-tunis.patch
+- Dropped tzdata-2010f-g.patch
+- Dropped tzdata-2010g-karachi.patch
+
+* Mon Mar 29 2010 Petr Machata  - 2010f-3
+- Tunisia not to observe DST in 2010 (tzdata-2010g-tunis.patch)
+- Pakistan not to observe DST in 2010 (tzdata-2010g-karachi.patch)
+
+* Thu Mar 25 2010 Petr Machata  - 2010f-2
+- Fix the path in tzdata-2010f-g.patch
+
+* Thu Mar 25 2010 Petr Machata  - 2010f-1
+- Upstream 2010f:
+  - Changes to Australian stations in Antarctica
+  - Correct 2010 Samoa DST start date
+  - New zone Antarctica/Macquarie
+  - Change Syria DST start from last Friday in March to first Friday
+    in April in 2010 and forward
+- Upstream 2010g proposal (tzdata-2010f-g.patch):
+  - No Bangladesh DST in 2010 and forward.
+  - Gaza DST starts last Saturday in March at 12:01 a.m. in 2010 and forward
+  - Kamchatka and Anadyr change to Moscow+8 on 2010-03-28
+  - Samara changes to Moscow+0 on 2010-03-28
+  - Related zone.tab updates
+
+* Tue Mar 09 2010 Petr Machata  - 2010e-1
+- Upstream 2010d
+  - The DST change in Bangladesh takes place a minute earlier
+  - Fiji to end DST on 2010-03-28 at 03:00, about a month earlier
+  - Samoa to observe DST this year; they didn't observe DST last year
+  - DST in Chile extended to 3 April
+- Upstream 2010e:
+  - Fix a typo in Bangladesh DST rule
+
+* Mon Mar 01 2010 Petr Machata  - 2010c-1
+- Upstream 2010a
+  - Source code cleanups
+  - Historical timestamps for Bangladesh
+- Upstream 2010b
+  - Northern Mexico's border cities share the DST schedule with the
+    United States
+- Upstream 2010c
+  - Paraguay DST now in effect from 2nd Sunday of April to 1st Sunday
+    of October
+
+* Mon Jan 04 2010 Petr Machata  - 2009u-1
+- Upstream 2009p
+  - Argentina does not enter DST on October 18
+  - San Luis switched from UTC-4 to UTC-3 on October 11th
+- Upstream 2009q
+  - Change DST end in Syria from November 1 to last Friday in October
+  - Changes to past Hong Kong transitions
+  - Kemerovo oblast' in Russia will change current time zone on March 28, 2010.
+    Asia/Novokuznetsk is the new time zone name
+- Upstream 2009r
+  - Changes to local times of three Australian research stations in Antarctica
+- Upstream 2009s
+  - Fiji plans to re-introduce DST from November 29th 2009 to April 25th 2010
+- Upstream 2009u
+  - Bangladesh changed their clock back to Standard Time on December 31, 2009
+- Dropped tzdata-2009o-argentinas.patch
+
+* Wed Oct 21 2009 Petr Machata  - 2009o-2
+- San Luis (Argentina) entered DST on October 11 (tzdata-2009o-argentinas.patch)
+
+* Mon Oct 19 2009 Petr Machata  - 2009o-1
+- Upstream 2009o
+  - Bangladesh won't go back to Standard Time from October 1, 2009
+  - Pakistan leaves DST on October 1, 2009
+- Dropped tzdata-2009m-karachi.patch
+- Argentina does not enter DST on October 18 (tzdata-2009o-argentinas.patch)
+
+* Tue Sep 22 2009 Petr Machata  - 2009m-2
+- Add markers for autoupdate of spec file
+- Pakistan leaves the period of DST on October 1 (tzdata-2009m-karachi.patch)
+
+* Wed Sep 16 2009 Petr Machata  - 2009m-1
+- Upstream 2009m
+  - Palestine will will revert back to winter time on Friday, 2009-09-04
+  - Samoa passed the DST Bill that fixes DST dates for 2009 and 2010
+- Drop Egypt patch
+
+* Thu Aug 13 2009 Petr Machata  - 2009k-3
+- Egypt starts winter time on August 21.
+
+* Sun Jul 26 2009 Fedora Release Engineering  - 2009k-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 20 2009 Petr Machata  - 2009k-1
+- Upstream 2009k
+  - Mauritius will not continue to observe DST the coming summer
+  - Arbitrarily end DST at the end of 2009 so that a POSIX-style time
+    zone string can appear in the Dhaka binary file
+
+* Thu Jun 18 2009 Petr Machata  - 2009j-1
+- Upstream 2009j
+  - DST switch for Bangladesh will occur an hour earlier than was
+    thought.
+
+* Mon Jun  8 2009 Petr Machata  - 2009i-1
+- Upstream 2009i
+  - Bangladesh introduces DST 2009-06-20
+
+* Tue May 26 2009 Petr Machata  - 2009h-2
+- Upstream 2009h
+  - Convert use of 00:00 stamps to 24:00 of the previous day
+  - Clarify that the data is Public Domain
+- Drop Cairo patch
+
+* Mon Apr 13 2009 Petr Machata  - 2009f-1
+- Upstream 2009f
+  - Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01
+- Drop Pakistan patch
+
+* Mon Apr 13 2009 Petr Machata  - 2009e-3
+- Bump up for rebuild
+
+* Mon Apr 13 2009 Petr Machata  - 2009e-2
+- Pakistan will observe DST between 2009-04-15 and (probably) 2009-11-01
+
+* Mon Apr  6 2009 Petr Machata  - 2009e-1
+- Upstream 2009e
+  - Historical changes for Jordan
+  - Palestine will start DST on 2009-03-26 and end 2009-09-27
+- Egypt ends DST on 2009-09-24
+
+* Mon Mar 23 2009 Petr Machata  - 2009d-1
+- Upstream 2009d
+  - Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00
+  - Tunisia will not observe DST this year.
+  - Syria will start DST on 2009-03-27 00:00 this year
+  - Cuba will start DST on midnight between 2009-03-07 and 2009-03-08
+  - Province of San Luis, Argentina, went to UTC-04:00 on 2009-03-15
+
+* Wed Feb 25 2009 Fedora Release Engineering  - 2009a-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jan 23 2009 Petr Machata  - 2009a-1
+- Upstream 2009a
+  - Fix Asia/Kathmandu spelling
+  - Historical timestamps for Switzerland and Cuba
+  - DST update for America/Resolute
+
+* Thu Oct 30 2008 Petr Machata  - 2008i-1
+- Upstream 2008i
+  - Updates for Argentina: Drop DST in zones America/Argentina/Jujuy,
+    La_Rioja, San_Juan, Catamarca, Mendoza, Rio_Gallegos, Ushuaia; new
+    zone America/Argentina/Salta (for provinces SA, LP, NQ, RN).
+
+* Mon Oct 13 2008 Petr Machata  - 2008h-1
+- Upstream 2008h
+  - Fix exact DST transition hour for Mauritius
+  - Syria will leave the period of DST on Nov 1
+  - Fix coordinates of Pacific/Niue
+
+* Tue Oct  7 2008 Petr Machata  - 2008g-1
+- Upstream 2008g
+  - Fixed future DST transitions for Brazil
+
+* Tue Sep 16 2008 Petr Machata  - 2008f-1
+- Upstream 2008f
+  - Changes for Mauritius (extends DST to years to come)
+  - Palestine changes clocks for the duration of Ramadan
+  - Argentina will start DST on Sunday October 19, 2008
+  - Brazil will start DST on 2008-10-19
+- Drop Pakistan and Morocco patches
+
+* Thu Aug 28 2008 Petr Machata  - 2008e-2
+- Pakistan DST is scheduled until Oct/31
+- Morocco DST is scheduled until Aug/31
+
+* Tue Aug 12 2008 Petr Machata  - 2008e-1
+- Upstream 2008e
+  - Changes for Mauritius
+  - Leap second coverage for 31/Dec 2008
+  - Corrections of historical dates
+
+* Tue Jul  8 2008 Petr Machata  - 2008d-1
+- Upstream 2008d
+  - Changes for Brazil and Mauritius
+
+* Fri May 30 2008 Petr Machata  - 2008c-1
+- Upstream 2008c
+  - Mongolia changes zone
+  - Pakistan DST is scheduled until Sep/1, instead of Aug/31
+- Drop Morocco and Pakistan patches that are superseded by upstream
+- Fix a typo in Java subpackage name
+
+* Tue May 27 2008 Petr Machata  - 2008b-3
+- Morocco introduces DST
+
+* Fri May 23 2008 Petr Machata  - 2008b-2
+- Pakistan introduces DST
+
+* Wed Mar 26 2008 Petr Machata  - 2008b-1
+- Upstream 2008b
+  - DST changes for Syria, Cuba; Iraq abandons DST
+  - Saigon zone renamed Ho_Chi_Minh; backward link provided
+  - Add America/Argentina/San_Luis information
+
+* Tue Mar  4 2008 Petr Machata  - 2007k-2
+- Chile moves DST to 29/Mar
+- Related: #435959
+
+* Thu Jan  3 2008 Petr Machata  - 2007k-1
+- Upstream 2007k
+  - Argentina readopted the daylight saving time
+
+* Tue Dec  4 2007 Petr Machata  - 2007j-1
+- Upstream 2007j
+  - New links America/St_Barthelemy and America/Marigot
+  - Venezuela is changing their clocks on December 9 at 03:00
+
+* Mon Nov  5 2007 Petr Machata  - 2007i-1
+- Upstream 2007i
+  - Syria DST will take place at Midnight between Thursday and Friday.
+  - Cuba will end DST on the last Sunday of October.
+- Update tst-timezone.c from glibc CVS
+
+* Mon Oct  1 2007 Petr Machata  - 2007h-1
+- Upstream 2007h
+  - Brazil will observe DST from 2007-10-14 to 2008-02-17
+  - Egypt and Gaza switched earlier than we expected
+  - Iran will resume DST next year
+  - Venezuela is scheduled to change TZ to -4:30 on January 1
+
+* Tue Sep 25 2007 Keith Seitz  - 2007g-2
+- Add support for building java's zoneinfo files in new
+  tzdata-java RPM.
+
+* Wed Aug 22 2007 Petr Machata  - 2007g-1
+- Fix licensing tag.
+- Upstream 2007g
+  - Egypt switches the September 7, not September 28
+  - Daviess, Dubous, Knox, Martin, and Pike Counties, Indiana, switch
+    from central to eastern time in November
+  - South Australia, Tasmania, Victoria, New South Wales and Lord Howe
+    Island are changing their DST rules effective next year
+  - Sync several Antarctic station's rules with the New Zealand
+  - leapseconds contain changes from the most recent IERS bulletin
+
+* Wed May  9 2007 Petr Machata  - 2007f-1
+- Upstream 2007f
+  - New Zealand is extending DST, starting later this year.
+  - Haiti no longer observes DST.
+  - The Turks and Caicos switch at 02:00, not at 00:00, and have
+    adopted US DST rules.
+
+* Tue Apr  3 2007 Petr Machata  - 2007e-1
+- Upstream 2007e
+  - Syria switched to summer time at Mar/29.
+  - Honduras will not enter DST this year.
+
+* Wed Mar 21 2007 Petr Machata  - 2007d-1
+- Upstream 2007d
+  - Mongolia has abolished DST.
+  - Turkey will use EU rules this year, changing at 01:00 UTC rather
+    than 01:00 standard time.
+  - Cuba observed DST starting Sunday.
+  - Resolute, Nunavut switched from Central to Eastern time last
+    November.
+
+* Mon Feb 26 2007 Petr Machata  - 2007c-1
+- Upstream 2007c
+  - Pulaski County, Indiana, switched back to eastern time.
+  - Turkey switches at 01:00 standard time, not at 01:00 UTC.
+- Upstream 2007b
+  - Changes to the commentary in "leapseconds".
+
+* Wed Feb  7 2007 Petr Machata  - 2007a-2
+- tidy up the specfile per rpmlint comments
+
+* Thu Jan 18 2007 Petr Machata  - 2007a-1
+- Upstream 2007a
+  - Updates to Bahamas, they will be in sync with 2007 US DST change
+  - New zone Australia/Eucla
+  - Africa/Asmera renamed to Africa/Asmara, link created
+  - Atlantic/Faeroe renamed to Atlantic/Faroe, link created
+- Packaging
+  - Adding BuildRequires: glibc-common >= 2.5.90-7 to build tzdata
+    with extended 64-bit format necessary for dates beyond 2037
+
+* Wed Nov 29 2006 Petr Machata  - 2006p-1
+- Upstream 2006p
+  - Official version of Western Australia DST trial changes
+  - Latitude/longitude changes for Europe/Jersey and Europe/Podgorica
+
+* Wed Nov 22 2006 Petr Machata  - 2006o-2
+- Patch for Western Australia DST trial
+
+* Thu Nov  9 2006 Petr Machata  - 2006o-1
+- Cuba has ended its three years of permanent DST.
+- Updates in historical timestamps for Chile.
+
+* Tue Oct 10 2006 Petr Machata  - 2006m-2
+- Proposed upstream patch (#210058)
+  - Jordan will switch to winter time on October 27, not September 29
+  - Brazil's DST this year is the first Sunday in November to the last
+    Sunday in February.  (Thanks to Frederico A. C. Neves.)
+  - ISO 3166 codes for Serbia and Montenegro, zone Europe/Podgorica
+  - Commentary and past timestamps changes
+
+* Tue Oct  3 2006 Petr Machata  - 2006m-1
+- Upstream 2006m:
+  - Adjustments for Egypt, Palestine, Uruguay
+  - Better description of `until' field in zic (8) manpage
+
+* Thu Sep 21 2006 Petr Machata  - 2006l-1
+- Upstream 2006k, 2006l:
+  - Adjustments for Egypt, Palestine, Cuba, Honduras
+  - Documentation changes
+
+* Tue Aug 22 2006 Petr Machata  - 2006j-1
+- Upstream 2006j
+  - Honduras stopped observing DST on Monday at 00:00
+  - America/Bermuda will follow the US's lead next year
+  - America/Moncton will use US-style rules next year
+  - New Zone America/Blanc-Sablon, for Canadians who observe AST all
+    year
+  - New zone: America/Atikokan instead of America/Coral_Harbour
+  - New zones: Europe/Jersey, Europe/Guernsey, Europe/Isle_of_Man
+  - Historical changes
+  - Commentary updates
+- Upstream 2006i
+  - localtime.c fixes
+- Upstream 2006h
+  - zic leapsecond fix
+
+* Wed Jul 12 2006 Jesse Keating  - 2006g-1.1
+- rebuild
+
+* Thu May 11 2006 Petr Machata  - 2006g-1
+- Honduras chose to follow Guatemala and will observe DST May/6 to Sep/2
+- Nicaragua updates
+
+* Tue May  2 2006 Petr Machata  - 2006f-1
+- Upstream 2006f
+  - America/Guatemala observes DST between Apr/30 and Oct/1
+  - Historical changes for Nicaragua
+  - Update of America/Indiana/Vincennes in zone table
+
+* Thu Apr 20 2006 Petr Machata  - 2006d-1
+- Upstream 2006d
+  - Haiti observes DST
+  - Sri Lanka change actually took effect Apr/15
+  - All Canada is now scheduled for 2007 US DST rules
+  - Some historical fixes
+
+* Thu Apr  6 2006 Petr Machata  - 2006c-1
+- Upstream 2006c
+  - Time-related changes:
+    - dozens of historical and commentary changes
+    - Iran stopped observing DST
+    - Sri Lanka switches from UTC+6 to UTC+5:30
+    - America/Thule and America/Edmonton will adopt new US rules,
+      starting 2007
+    - Tunisia is adopting regular DST
+  - Code:
+    - asctime.c: Chages in format strings to silent gcc warnings
+    - removing K&R notation from function signatures
+    - few fixes across the code
+
+* Thu Mar 16 2006 Petr Machata  - 2006b-2
+- Patch for Sri Lanka time zone change (#184514)
+
+* Wed Feb 22 2006 Petr Machata  2006b-1
+- Upstream 2006b:
+  - using tz64code version, as 32 is legacy according to tzdata ML
+  - new manual pages for ctime, strftime, tzset
+  - some source code reorganizations
+  - no timezone/dst rule updates
+
+* Thu Feb 02 2006 Petr Machata  2006a-2
+- Small changes in tst-timezone.c
+
+* Thu Feb 02 2006 Petr Machata  2006a-1
+- Upstream 2006a:
+  - private.h(scheck): changing char* to char const*
+  - Rule changes for Palestine, zone changes for Indiana/US, both
+    changes for Canada.
+  - Many related doc changes.
+- Naming scheme in spec file doesn't use %%{name}, but tzdata.
+
+* Thu Jan 12 2006 Petr Machata  2005r-3
+- 2005r-3
+  - Meta changes.  Renaming tzdata.tar.bz2 file to tzdata$ver-base,
+    so that it won't clash across updates.
+
+* Thu Jan  5 2006 Petr Machata  2005r-2
+- 2005r
+  - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to
+    northamerica to guard against old files with obsolete information
+    being left in the time zone binary directory.
+  - Changes for countries that are supposed to join 2007 US DST
+    change.  This includes most of Canada, however entries already in
+    the database (Alberta, British Columbia, Newfoundland, Northwest
+    Territories, and Yukon) were left alone for the time being.
+  - Fixes in zdump.c (abbrok): conditions are chained, and the string
+    is checked for emptiness.
+
+* Sat Dec 17 2005 Jakub Jelinek  2005q-2
+- 2005q
+  - changes for Georgia, Azerbaijan, Jordan, Palestine, Cuba, Nicaragua
+  - SystemV timezone changes
+
+* Wed Nov  2 2005 Jakub Jelinek  2005n-2
+- 2005n
+  - changes for Kyrgyzstan and Uruguay
+- fix a typo in the Makefile (used TZDATA env var instead of TZDIR during
+  make check), update tst-timezone.c from glibc CVS (#172102)
+
+* Tue Sep  6 2005 Jakub Jelinek  2005m-2
+- 2005m
+  - changes for USA (extending DST by 4 weeks since 2007), Tunisia,
+    Australia, Kazakhstan
+  - historical timezone data changes for Japan, Poland, Northern Ireland and
+    Mali
+  - timezone name change for East Timor
+
+* Fri Jul 15 2005 Jakub Jelinek  2005k-2
+- 2005k
+  - leap seconds update
+
+* Sat Apr 30 2005 Jakub Jelinek  2005i-2
+- 2005i
+  - updates for Iran, Haiti and Nicaragua
+
+* Mon Apr  4 2005 Jakub Jelinek  2005h-2
+- 2005h
+  - fixes for Kazakhstan
+
+* Thu Mar 17 2005 Jakub Jelinek  2005g-2
+- 2005g
+  - fixes for Uruguay
+- include README and Theory from tzcode tarball in %%{_docdir};
+  Theory includes a good summary of how the timezone data files
+  are supposed to be named
+
+* Tue Mar  1 2005 Jakub Jelinek  2005f-2
+- 2005f
+  - more updates for Israel, updates for Azerbaijan
+
+* Wed Jan 26 2005 Jakub Jelinek  2005c-3
+- 2005c
+  - updates for Israel and Paraguay
+
+* Mon Nov 29 2004 Jakub Jelinek  2004g-1
+- 2004g (#141107)
+  - updates for Cuba
+
+* Mon Oct 11 2004 Jakub Jelinek  2004e-2
+- 2004e (#135194)
+  - updates for Brazil, Uruguay and Argentina
+
+* Wed Aug  4 2004 Jakub Jelinek  2004b-2
+- 2004b
+
+* Mon Oct  6 2003 Jakub Jelinek  2003d-1
+- 2003d
+
+* Thu Sep 25 2003 Jakub Jelinek  2003c-1
+- 2003c
+- updates for Brazil (#104840)
+
+* Mon Jul 28 2003 Jakub Jelinek  2003a-2
+- rebuilt
+
+* Mon Jul 28 2003 Jakub Jelinek  2003a-1
+- initial package

From 55fef8cdba647763749018b67ad89c750000b0a0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Thu, 27 Jul 2017 20:50:42 +0000
Subject: [PATCH 248/280] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 tzdata.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index e1e08eb..bbfd727 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2017b
 %define tzdata_version 2017b
 %define tzcode_version 2017b
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering  - 2017b-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sun Mar 26 2017 Patsy Franklin  - 2017b-1
 - Rebase to tzdata-2017b
   - Haiti began observing DST on March 12, 2017.

From 2744610bc452ecc3b8b97c5c54fb59726dd61771 Mon Sep 17 00:00:00 2001
From: Troy Dawson 
Date: Fri, 11 Aug 2017 14:49:05 -0700
Subject: [PATCH 249/280] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild fed_hash:
 55fef8cdba647763749018b67ad89c750000b0a0

---
 tzdata.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tzdata.spec b/tzdata.spec
index 6dcb346..bbfd727 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2017b
 %define tzdata_version 2017b
 %define tzcode_version 2017b
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -12,7 +12,7 @@ Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
 # Add new patches here...
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gawk, glibc, perl
+BuildRequires: gawk, glibc, perl-interpreter
 BuildRequires: java-devel
 BuildRequires: glibc-common >= 2.5.90-7
 Conflicts: glibc-common <= 2.3.2-63
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering  - 2017b-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sun Mar 26 2017 Patsy Franklin  - 2017b-1
 - Rebase to tzdata-2017b
   - Haiti began observing DST on March 12, 2017.

From 00f1b9ba49f069d99ae2a3f574814327d9748aaf Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Sun, 29 Oct 2017 19:39:21 -0400
Subject: [PATCH 250/280] Resolves #1507341 - Rebase to tzdata-2017c    -
 Northern Cyprus will revert to using EQ rules on October 29, 2017.    - Sudan
 will switch from +03 to +02 on November 1, 2017.    - Tonga will not change
 it's clocks on Novemeber 5, 2017 ending it's      experiment with DST.    -
 Fiji DST will end on January 14, 2018 rather than January 21, 2018.    -
 Namibia - starting September 3, 2017 switches from +)1 with DST to      +02
 all year.  This change takes effect April 1, 2018.    - Turks & Caicos
 changes from -04 all year to -05 with US DST starting      on March 11, 2018.
  Effective change date is November 4, 2018.    - tzdata now includes two text
 versions of the time zone data - tzdata.zi      and leapseconds.    -
 Includes two patches to deal with build issues.

---
 .gitignore                          |   2 +
 0001-Fix-Makefile-quoting-bug.patch | 149 ++++++++++++++++++++++++++++
 0002-Fix-have-snprintf-error.patch  |  12 +++
 sources                             |   4 +-
 tzdata.spec                         |  37 +++++--
 5 files changed, 194 insertions(+), 10 deletions(-)
 create mode 100644 0001-Fix-Makefile-quoting-bug.patch
 create mode 100644 0002-Fix-have-snprintf-error.patch

diff --git a/.gitignore b/.gitignore
index 2e7df3c..ad3251d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,3 +156,5 @@ noarch/
 /tzcode2017a.tar.gz
 /tzcode2017b.tar.gz
 /tzdata2017b.tar.gz
+/tzcode2017c.tar.gz
+/tzdata2017c.tar.gz
diff --git a/0001-Fix-Makefile-quoting-bug.patch b/0001-Fix-Makefile-quoting-bug.patch
new file mode 100644
index 0000000..868ec9a
--- /dev/null
+++ b/0001-Fix-Makefile-quoting-bug.patch
@@ -0,0 +1,149 @@
+From b520d20b8122a783f99f088758b78d928f70ee34 Mon Sep 17 00:00:00 2001
+From: Paul Eggert 
+Date: Mon, 23 Oct 2017 11:42:45 -0700
+Subject: [PROPOSED] Fix Makefile quoting bug
+
+Problem with INSTALLARGS reported by Zefram in:
+https://mm.icann.org/pipermail/tz/2017-October/025360.html
+Fix similar problems too.
+* Makefile (ZIC_INSTALL, VALIDATE_ENV, CC, install)
+(INSTALL, version, INSTALLARGS, right_posix, posix_right)
+(check_public): Use apostrophes to prevent undesirable
+interpretation of names by the shell.  We still do not support
+directory names containing apostrophes or newlines, but this is
+good enough.
+* NEWS: Mention this.
+---
+ Makefile | 64 ++++++++++++++++++++++++++++++++--------------------------------
+ NEWS     |  8 ++++++++
+ 2 files changed, 40 insertions(+), 32 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c92edc0..97649ca 100644
+--- a/Makefile
++++ b/Makefile
+@@ -313,7 +313,7 @@ ZFLAGS=
+ 
+ # How to use zic to install tz binary files.
+ 
+-ZIC_INSTALL=	$(ZIC) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
++ZIC_INSTALL=	$(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
+ 
+ # The name of a Posix-compliant 'awk' on your system.
+ AWK=		awk
+@@ -341,8 +341,8 @@ SGML_CATALOG_FILES= \
+ VALIDATE = nsgmls
+ VALIDATE_FLAGS = -s -B -wall -wno-unused-param
+ VALIDATE_ENV = \
+-  SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
+-  SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \
++  SGML_CATALOG_FILES='$(SGML_CATALOG_FILES)' \
++  SGML_SEARCH_PATH='$(SGML_SEARCH_PATH)' \
+   SP_CHARSET_FIXED=YES \
+   SP_ENCODING=UTF-8
+ 
+@@ -396,7 +396,7 @@ GZIPFLAGS=	-9n
+ #MAKE=		make
+ 
+ cc=		cc
+-CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
++CC=		$(cc) -DTZDIR='"$(TZDIR)"'
+ 
+ AR=		ar
+ 
+@@ -473,29 +473,29 @@ all:		tzselect yearistype zic zdump libtz.a $(TABDATA)
+ ALL:		all date $(ENCHILADA)
+ 
+ install:	all $(DATA) $(REDO) $(MANS)
+-		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
+-			$(DESTDIR)$(LIBDIR) \
+-			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
+-			$(DESTDIR)$(MANDIR)/man8
++		mkdir -p '$(DESTDIR)$(ETCDIR)' '$(DESTDIR)$(TZDIR)' \
++			'$(DESTDIR)$(LIBDIR)' \
++			'$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \
++			'$(DESTDIR)$(MANDIR)/man8'
+ 		$(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES)
+-		cp -f $(TABDATA) $(DESTDIR)$(TZDIR)/.
+-		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
+-		cp libtz.a $(DESTDIR)$(LIBDIR)/.
+-		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
+-		cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
+-		cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
+-		cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
++		cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.'
++		cp tzselect zic zdump '$(DESTDIR)$(ETCDIR)/.'
++		cp libtz.a '$(DESTDIR)$(LIBDIR)/.'
++		$(RANLIB) '$(DESTDIR)$(LIBDIR)/libtz.a'
++		cp -f newctime.3 newtzset.3 '$(DESTDIR)$(MANDIR)/man3/.'
++		cp -f tzfile.5 '$(DESTDIR)$(MANDIR)/man5/.'
++		cp -f tzselect.8 zdump.8 zic.8 '$(DESTDIR)$(MANDIR)/man8/.'
+ 
+ INSTALL:	ALL install date.1
+-		mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
+-		cp date $(DESTDIR)$(BINDIR)/.
+-		cp -f date.1 $(DESTDIR)$(MANDIR)/man1/.
++		mkdir -p '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1'
++		cp date '$(DESTDIR)$(BINDIR)/.'
++		cp -f date.1 '$(DESTDIR)$(MANDIR)/man1/.'
+ 
+ version:	$(VERSION_DEPS)
+ 		{ (type git) >/dev/null 2>&1 && \
+ 		  V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
+ 				--abbrev=7 --dirty` || \
+-		  V=$(VERSION); } && \
++		  V='$(VERSION)'; } && \
+ 		printf '%s\n' "$$V" >$@.out
+ 		mv $@.out $@
+ 
+@@ -529,12 +529,12 @@ leapseconds:	$(LEAP_DEPS)
+ # Arguments to pass to submakes of install_data.
+ # They can be overridden by later submake arguments.
+ INSTALLARGS = \
+- BACKWARD=$(BACKWARD) \
+- DESTDIR=$(DESTDIR) \
++ BACKWARD='$(BACKWARD)' \
++ DESTDIR='$(DESTDIR)' \
+  LEAPSECONDS='$(LEAPSECONDS)' \
+  PACKRATDATA='$(PACKRATDATA)' \
+- TZDIR=$(TZDIR) \
+- YEARISTYPE=$(YEARISTYPE) \
++ TZDIR='$(TZDIR)' \
++ YEARISTYPE='$(YEARISTYPE)' \
+  ZIC='$(ZIC)'
+ 
+ # 'make install_data' installs one set of tz binary files.
+@@ -558,16 +558,16 @@ right_only:
+ # You must replace all of $(TZDIR) to switch from not using leap seconds
+ # to using them, or vice versa.
+ right_posix:	right_only
+-		rm -fr $(DESTDIR)$(TZDIR)-leaps
+-		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
+-		  $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
+-		$(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
++		rm -fr '$(DESTDIR)$(TZDIR)-leaps'
++		ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-leaps' || \
++		  $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only
++		$(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only
+ 
+ posix_right:	posix_only
+-		rm -fr $(DESTDIR)$(TZDIR)-posix
+-		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
+-		  $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
+-		$(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
++		rm -fr '$(DESTDIR)$(TZDIR)-posix'
++		ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-posix' || \
++		  $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only
++		$(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only
+ 
+ # This obsolescent rule is present for backwards compatibility with
+ # tz releases 2014g through 2015g.  It should go away eventually.
+@@ -764,7 +764,7 @@ set-timestamps.out: $(ENCHILADA)
+ 
+ check_public:
+ 		$(MAKE) maintainer-clean
+-		$(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL
++		$(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' ALL
+ 		mkdir -p public.dir
+ 		for i in $(TDATA) tzdata.zi; do \
+ 		  $(zic) -v -d public.dir $$i 2>&1 || exit; \
diff --git a/0002-Fix-have-snprintf-error.patch b/0002-Fix-have-snprintf-error.patch
new file mode 100644
index 0000000..cafdf4d
--- /dev/null
+++ b/0002-Fix-have-snprintf-error.patch
@@ -0,0 +1,12 @@
+diff -Nrup a/Makefile b/Makefile
+--- a/Makefile	2017-10-23 18:03:40.237177646 -0400
++++ b/Makefile	2017-10-23 18:06:20.060683518 -0400
+@@ -292,7 +292,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn
+ # January's first Monday when a "%V" format is used and January 1
+ # falls on a Friday, Saturday, or Sunday.
+ 
+-CFLAGS=
++CFLAGS= -DHAVE_SNPRINTF=1
+ 
+ # Linker flags.  Default to $(LFLAGS) for backwards compatibility
+ # to release 2012h and earlier.
diff --git a/sources b/sources
index 422e6ae..ef2c9d2 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2017b.tar.gz) = 9a73af4b868506d1f6287a8285dea489e68f6828da19509114f9144e2a2019c7fd28f4fb98ea907030d11d011ce3a87d99dbe43bca218beddafff151f0d61df1
-SHA512 (tzdata2017b.tar.gz) = 3e090dba1f52e4c63b4930b28f4bf38b56aabd6728f23094cb5801d10f4e464f17231f17b75b8866714bf98199c166ea840de0787b75b2274aa419a4e14bbc4d
+SHA512 (tzcode2017c.tar.gz) = 0d8c3e07b0de9015a137602450468ceb6358312a50eeda2a860882367107b8ba9ef275880b292570a671b9910afc54e6209e1e642387d246bc9c08c4ff660ffb
+SHA512 (tzdata2017c.tar.gz) = feb5c544e617b30c73a397e5a1c51f9847d0fddf1dfa0f9ace2e6f686786f09b666937b2048e07075c84593fc584bd5a25d639fce70eca9735267df28621ab4c
diff --git a/tzdata.spec b/tzdata.spec
index bbfd727..f92343a 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,15 +1,17 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2017b
-%define tzdata_version 2017b
-%define tzcode_version 2017b
-Release: 2%{?dist}
+Version: 2017c
+%define tzdata_version 2017c
+%define tzcode_version 2017c
+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
-# Add new patches here...
+
+Patch001: 0001-Fix-Makefile-quoting-bug.patch
+Patch002: 0002-Fix-have-snprintf-error.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl-interpreter
@@ -39,7 +41,8 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
-# Add new patches here...
+%patch001 -p1
+%patch002 -p1
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -67,6 +70,9 @@ tar xf %{SOURCE4}
 echo "%{name}%{tzdata_version}" >> VERSION
 
 %build
+# Run make to create the tzdata.zi file
+make tzdata.zi
+
 FILES="africa antarctica asia australasia europe northamerica southamerica
        pacificnew etcetera backward"
 
@@ -100,7 +106,7 @@ java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
 rm -fr $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}
 cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir}
-install -p -m 644 zone.tab zone1970.tab iso3166.tab $RPM_BUILD_ROOT%{_datadir}/zoneinfo
+install -p -m 644 zone.tab zone1970.tab iso3166.tab leapseconds tzdata.zi $RPM_BUILD_ROOT%{_datadir}/zoneinfo
 cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
 install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
@@ -113,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/zoneinfo
 %license LICENSE
 %doc README
-%doc Theory
+%doc theory.html
 %doc tz-link.html
 
 %files java
@@ -122,6 +128,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Oct 26 2017 Patsy Franklin  - 2017c-1
+- Rebase to tzdata-2017c.
+  - Northern Cyprus will revert to using EQ rules on October 29, 2017.
+  - Sudan will switch from +03 to +02 on November 1, 2017.
+  - Tonga will not change it's clocks on Novemeber 5, 2017 ending it's
+    experiment with DST.
+  - Fiji DST will end on January 14, 2018 rather than January 21, 2018.
+  - Namibia - starting September 3, 2017 switches from +)1 with DST to
+    +02 all year.  This change takes effect April 1, 2018.
+  - Turks & Caicos changes from -04 all year to -05 with US DST starting
+    on March 11, 2018.  Effective change date is November 4, 2018.
+  - tzdata now includes two text versions of the time zone data - tzdata.zi
+    and leapseconds.
+  - Includes two patches to deal with build issues.
+
 * Thu Jul 27 2017 Fedora Release Engineering  - 2017b-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 7b508c803fa23e23cb711c5e109d7e09f131bf4b Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Fri, 2 Feb 2018 09:41:45 -0500
Subject: [PATCH 251/280] =?UTF-8?q?Resolves:=20#1535266=20-=20Rebase=20to?=
 =?UTF-8?q?=20tzdata-2018c:=20=20=20-=20S=C3=A3o=20Tom=C3=A9=20and=20Pr?=
 =?UTF-8?q?=C3=ADncipe=20changed=20from=20+00=20to=20+01=20on=20January=20?=
 =?UTF-8?q?1,=202018=20=20=20-=20Brazil's=20DST=20will=20start=20on=20the?=
 =?UTF-8?q?=20first=20Sunday=20in=20November=20=20=20-=20Support=20for=20t?=
 =?UTF-8?q?he=20new=20zic=20-t=20option.=20=20=20-=20Add=20back=20pacificn?=
 =?UTF-8?q?ew=20file=20omitted=20in=20tzdata-2018a?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 18 ++++++++++++------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad3251d..e1645bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,3 +158,5 @@ noarch/
 /tzdata2017b.tar.gz
 /tzcode2017c.tar.gz
 /tzdata2017c.tar.gz
+/tzcode2018c.tar.gz
+/tzdata2018c.tar.gz
diff --git a/sources b/sources
index ef2c9d2..b272d41 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2017c.tar.gz) = 0d8c3e07b0de9015a137602450468ceb6358312a50eeda2a860882367107b8ba9ef275880b292570a671b9910afc54e6209e1e642387d246bc9c08c4ff660ffb
-SHA512 (tzdata2017c.tar.gz) = feb5c544e617b30c73a397e5a1c51f9847d0fddf1dfa0f9ace2e6f686786f09b666937b2048e07075c84593fc584bd5a25d639fce70eca9735267df28621ab4c
+SHA512 (tzcode2018c.tar.gz) = 21988e876479e38661d41ea4c7b5218ba14b979739d7ba8d49a2d343bb9f37c654056ab21c046a6652715f012e4ca33c4aa109b1ec3ac5d0244dd3a7ea9ed6d2
+SHA512 (tzdata2018c.tar.gz) = 0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835
diff --git a/tzdata.spec b/tzdata.spec
index f92343a..48f1c01 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2017c
-%define tzdata_version 2017c
-%define tzcode_version 2017c
+Version: 2018c
+%define tzdata_version 2018c
+%define tzcode_version 2018c
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -10,7 +10,6 @@ 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
 
-Patch001: 0001-Fix-Makefile-quoting-bug.patch
 Patch002: 0002-Fix-have-snprintf-error.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,7 +40,6 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
-%patch001 -p1
 %patch002 -p1
 
 mkdir javazic
@@ -81,7 +79,7 @@ zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
 zic -y ./yearistype -d zoneinfo/posix -L /dev/null $FILES
 zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
 
-grep -v tz-art.htm tz-link.htm > tz-link.html
+# grep -v tz-art.htm tz-link.htm > tz-link.html
 
 # Java 6/7 tzdata
 pushd javazic
@@ -121,6 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README
 %doc theory.html
 %doc tz-link.html
+%doc tz-art.html
 
 %files java
 %defattr(-,root,root)
@@ -128,6 +127,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Feb 01 2018 Patsy Franklin  - 2018c-1
+- Rebase to tzdata-2018c:
+  - São Tomé and Príncipe changed from +00 to +01 on January 1, 2018
+  - Brazil's DST will start on the first Sunday in November
+  - Support for the new zic -t option.
+  - Add back pacificnew file omitted in tzdata-2018a
+
 * Thu Oct 26 2017 Patsy Franklin  - 2017c-1
 - Rebase to tzdata-2017c.
   - Northern Cyprus will revert to using EQ rules on October 29, 2017.

From 0e16a242a710574c7a3d84e022983dd67c7ae7bb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Fri, 9 Feb 2018 19:49:26 +0000
Subject: [PATCH 252/280] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering 
---
 tzdata.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index 48f1c01..14c4037 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2018c
 %define tzdata_version 2018c
 %define tzcode_version 2018c
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering  - 2018c-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Feb 01 2018 Patsy Franklin  - 2018c-1
 - Rebase to tzdata-2018c:
   - São Tomé and Príncipe changed from +00 to +01 on January 1, 2018

From 1cfd494af2362fcfe61876a562fe5a9e2e750763 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko 
Date: Wed, 14 Feb 2018 00:46:00 +0100
Subject: [PATCH 253/280] Remove BuildRoot definition

None of currently supported distributions need that.
It was needed last for EL5 which is EOL now

Signed-off-by: Igor Gnatenko 
---
 tzdata.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index 14c4037..584113d 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -12,7 +12,6 @@ Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
 
 Patch002: 0002-Fix-have-snprintf-error.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl-interpreter
 BuildRequires: java-devel
 BuildRequires: glibc-common >= 2.5.90-7

From 2b00b80dcdfa5eecb4b5d0f81103c15d15275ede Mon Sep 17 00:00:00 2001
From: Igor Gnatenko 
Date: Wed, 14 Feb 2018 08:56:44 +0100
Subject: [PATCH 254/280] Remove %clean section

None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.

Signed-off-by: Igor Gnatenko 
---
 tzdata.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tzdata.spec b/tzdata.spec
index 584113d..c6ae368 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -108,9 +108,6 @@ cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
 install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %{_datadir}/zoneinfo

From 0d21a9b765c61fb3bc78b863a035e5b728892ccb Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 28 Mar 2018 16:22:47 -0400
Subject: [PATCH 255/280] Resolves: #1560131 - Rebase to tzdata-2018d:   - DST
 for Asia/Gaza and Asia/Hebron has changed from March 31 to March 24.   -
 Antarctica/Casey station changed to UTC+8 on March 11.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 14 ++++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index e1645bf..aa65342 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,3 +160,5 @@ noarch/
 /tzdata2017c.tar.gz
 /tzcode2018c.tar.gz
 /tzdata2018c.tar.gz
+/tzcode2018d.tar.gz
+/tzdata2018d.tar.gz
diff --git a/sources b/sources
index b272d41..e64a5c0 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2018c.tar.gz) = 21988e876479e38661d41ea4c7b5218ba14b979739d7ba8d49a2d343bb9f37c654056ab21c046a6652715f012e4ca33c4aa109b1ec3ac5d0244dd3a7ea9ed6d2
-SHA512 (tzdata2018c.tar.gz) = 0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835
+SHA512 (tzcode2018d.tar.gz) = e79a95e235cd384247e4112d5154f30eb7b40f28dab4872ed9153e45bf56569949d0845bc1b9ad24b7a5f9609bdadfc892959dbf0d540dbca79b18398dc4f930
+SHA512 (tzdata2018d.tar.gz) = ee961aedc34e134172523a29fb8a9358f42649d06ffcd2d8a6ad86eeb174a80af5bfc4637e9e52ecdc51fa3d01afef9fff660a69ed72904ff747a59b5634830b
diff --git a/tzdata.spec b/tzdata.spec
index c6ae368..5272d1a 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2018c
-%define tzdata_version 2018c
-%define tzcode_version 2018c
-Release: 2%{?dist}
+Version: 2018d
+%define tzdata_version 2018d
+%define tzcode_version 2018d
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -123,6 +123,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Mar 28 2018 Patsy Franklin  - 2018d-1
+- Rebase to tzdata-2018d:
+  - DST for Asia/Gaza and Asia/Hebron has changed 
+    from March 31 to March 24.
+  - Antarctica/Casey station changed to UTC+8 on March 11.
+
 * Fri Feb 09 2018 Fedora Release Engineering  - 2018c-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 92df08180d8f24480b620882b009d52840077e97 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Tue, 29 May 2018 13:53:44 -0400
Subject: [PATCH 256/280] Resolves: #1583794   Rebase to tzdata-2018e   - North
 Korea changed from UTC+8:30 to UTC+9 on May 5, 2018.   - In this update, the
 upstream project now defaults to using     the "vanguard" data implementation
 which includes negative DST offsets.

---
 .gitignore    |  2 ++
 8051641.patch | 17 +++++++++++++++++
 sources       |  4 ++--
 tzdata.spec   | 14 +++++++++++---
 4 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 8051641.patch

diff --git a/.gitignore b/.gitignore
index aa65342..f0fd88e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,3 +162,5 @@ noarch/
 /tzdata2018c.tar.gz
 /tzcode2018d.tar.gz
 /tzdata2018d.tar.gz
+/tzcode2018e.tar.gz
+/tzdata2018e.tar.gz
diff --git a/8051641.patch b/8051641.patch
new file mode 100644
index 0000000..4f5be47
--- /dev/null
+++ b/8051641.patch
@@ -0,0 +1,17 @@
+diff -r c8a71253d6e2 -r 189490f29d1e make/src/classes/build/tools/tzdb/ZoneRulesBuilder.java
+--- javazic-1.8/build/tools/tzdb/ZoneRulesBuilder.java	Thu Oct 23 11:42:20 2014 +0200
++++ javazic-1.8/build/tools/tzdb/ZoneRulesBuilder.java	Mon Dec 29 21:42:22 2014 +0300
+@@ -491,10 +491,10 @@
+                 TZRule rule = new TZRule(year, month, dayOfMonthIndicator, dayOfWeek, time, timeEndOfDay, timeDefinition, savingAmountSecs);
+                 if (lastRule) {
+                     lastRuleList.add(rule);
+-                    maxLastRuleStartYear = Math.max(startYear, maxLastRuleStartYear);
+                 } else {
+                     ruleList.add(rule);
+                 }
++                maxLastRuleStartYear = Math.max(startYear, maxLastRuleStartYear);
+                 year++;
+             }
+         }
+--
+cgit v0.9.2
diff --git a/sources b/sources
index e64a5c0..2198b31 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2018d.tar.gz) = e79a95e235cd384247e4112d5154f30eb7b40f28dab4872ed9153e45bf56569949d0845bc1b9ad24b7a5f9609bdadfc892959dbf0d540dbca79b18398dc4f930
-SHA512 (tzdata2018d.tar.gz) = ee961aedc34e134172523a29fb8a9358f42649d06ffcd2d8a6ad86eeb174a80af5bfc4637e9e52ecdc51fa3d01afef9fff660a69ed72904ff747a59b5634830b
+SHA512 (tzcode2018e.tar.gz) = 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717
+SHA512 (tzdata2018e.tar.gz) = d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae
diff --git a/tzdata.spec b/tzdata.spec
index 5272d1a..80b726f 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2018d
-%define tzdata_version 2018d
-%define tzcode_version 2018d
+Version: 2018e
+%define tzdata_version 2018e
+%define tzcode_version 2018e
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -32,6 +32,7 @@ Patch101: rebase-01.patch
 Patch102: rebase-02.patch
 Patch103: 7090844.patch
 Patch104: 7133138.patch
+Patch105: 8051641.patch
 
 %description java
 This package contains timezone information for use by Java runtimes.
@@ -63,6 +64,7 @@ find . -type f -name '*.java' -print0 \
 popd
 
 tar xf %{SOURCE4}
+%patch105
 
 echo "%{name}%{tzdata_version}" >> VERSION
 
@@ -123,6 +125,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Mon May 14 2018 Patsy Franklin  - 2018e-1
+- Rebase to tzdata-2018e
+  - North Korea changed from UTC+8:30 to UTC+9 on May 5, 2018.
+  - In this update, the upstream project now defaults to using
+    the "vanguard" data implementation which includes negative DST offsets.
+
 * Wed Mar 28 2018 Patsy Franklin  - 2018d-1
 - Rebase to tzdata-2018d:
   - DST for Asia/Gaza and Asia/Hebron has changed 

From dca907e4a84295866ac75fe14988335152659bc9 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Mon, 1 Oct 2018 07:32:41 -0400
Subject: [PATCH 257/280] Resolves: #1633772 - Add make check for testing.

---
 tzdata.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index 80b726f..695fe54 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2018e
 %define tzdata_version 2018e
 %define tzcode_version 2018e
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -110,6 +110,11 @@ cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
 install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 
+%check
+echo ============TESTING===============
+/usr/bin/env LANG=C make -k VALIDATE=':' check && true
+echo ============END TESTING===========
+
 %files
 %defattr(-,root,root)
 %{_datadir}/zoneinfo
@@ -125,6 +130,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Fri Sep 28 2018 Patsy Franklin  - 2018e-2
+- Add make check for testing.
+
 * Mon May 14 2018 Patsy Franklin  - 2018e-1
 - Rebase to tzdata-2018e
   - North Korea changed from UTC+8:30 to UTC+9 on May 5, 2018.

From bf8244d2b4809cc29bd81a58c2f20b3870463daf Mon Sep 17 00:00:00 2001
From: Milos Prchlik 
Date: Wed, 17 Oct 2018 13:33:35 +0200
Subject: [PATCH 258/280] Enable gating based on BaseOS CI results

Based on [1], enables gating governed by BaseOS CI results.

[1] https://docs.google.com/document/d/1zvG03jABz8Od6W8YkQ8ewOKt10kzmQ0KYNjL1QOcKoE/
---
 gating.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 gating.yaml

diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..7755c22
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional}

From 6b9f27544c4f5676fd35f8a1cc6eaddf792bfaf5 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Tue, 13 Nov 2018 22:40:25 -0500
Subject: [PATCH 259/280] Resolves: #1643782 - Rebase to tzdata-2018g   -
 Morocco will remain at UTC+1 rather than switching back to UTC+0 as    
 planned.  This change is effective Octobober 28, 2018. - Include changes
 introduced in tzdata-2018f   - Volgograd will change from UTC+03 to UTC+04 on
 2018-10-28 at 02:00.   - Fiji will end DST on 2019-01-13 instead of the
 2019-01-20 as     previously predicted.   - Most of Chile will end DST on the
 first Saturday in April at 24:00     and restart DST on the first Saturday in
 September at 24:00.

---
 .gitignore                                    |  2 +
 ...ect-tm_dst-during-Morocco-transition.patch | 82 +++++++++++++++++++
 sources                                       |  4 +-
 tzdata.spec                                   | 42 ++++++++--
 4 files changed, 122 insertions(+), 8 deletions(-)
 create mode 100644 0001-Correct-tm_dst-during-Morocco-transition.patch

diff --git a/.gitignore b/.gitignore
index f0fd88e..acb4ae4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,3 +164,5 @@ noarch/
 /tzdata2018d.tar.gz
 /tzcode2018e.tar.gz
 /tzdata2018e.tar.gz
+/tzcode2018g.tar.gz
+/tzdata2018g.tar.gz
diff --git a/0001-Correct-tm_dst-during-Morocco-transition.patch b/0001-Correct-tm_dst-during-Morocco-transition.patch
new file mode 100644
index 0000000..b7b9256
--- /dev/null
+++ b/0001-Correct-tm_dst-during-Morocco-transition.patch
@@ -0,0 +1,82 @@
+From ddc67c5c9aac03778d99090211437d4b869e5742 Mon Sep 17 00:00:00 2001
+From: Paul Eggert 
+Date: Sun, 28 Oct 2018 12:10:43 -0700
+Subject: [PROPOSED] Correct tm_dst during Morocco transition
+
+(Thanks to Michael Deckers and Matt Johnson.)
+* NEWS: Mention this, and correct the misleading 2018g notes
+without misrepresenting the 2018g change.
+* africa (Africa/Casablanca, Africa/El_Aaiun):
+Transition was at 2018-10-28 03:00, not 2018-10-27.
+---
+ NEWS   | 15 ++++++++++++---
+ africa |  8 ++++----
+ 2 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index d4cb723..f9bbc0c 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,14 +1,23 @@
+ News for the tz database
+ 
++Unreleased, experimental changes
++
++  Changes to past tm_isdst flags
++
++    For the recent Morocco change, the tm_isdst flag should be 1 from
++    2018-10-27 00:00 to 2018-10-28 03:00.  (Thanks to Michael Deckers.)
++    Give a URL to the official decree.  (Thanks to .)
++
++
+ Release 2018g - 2018-10-26 22:22:45 -0700
+ 
+   Briefly:
+-    Morocco switches to permanent +01 on 2018-10-27.
++    Morocco switches to permanent +01 on 2018-10-28.
+ 
+   Changes to future timestamps
+ 
+-    Morocco switches from +00/+01 to permanent +01 effective 2018-10-27,
+-    so its clocks will not fall back on 2018-10-28 as previously scheduled.
++    Morocco switches from +00/+01 to permanent +01 effective 2018-10-28,
++    so its clocks will not fall back as previously scheduled.
+     (Thanks to Mohamed Essedik Najd and Brian Inglis.)
+ 
+   Changes to code
+diff --git a/africa b/africa
+index a26b91b..2a15e1e 100644
+--- a/africa
++++ b/africa
+@@ -847,8 +847,8 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
+ # From Mohamed Essedik Najd (2018-10-26):
+ # Today, a Moroccan government council approved the perpetual addition
+ # of 60 minutes to the regular Moroccan timezone.
+-# From Brian Inglis (2018-10-26):
+-# http://www.maroc.ma/fr/actualites/le-conseil-de-gouvernement-adopte-un-projet-de-decret-relatif-lheure-legale-stipulant-le
++# From Matt Johnson (2018-10-28):
++# http://www.sgg.gov.ma/Portals/1/BO/2018/BO_6720-bis_Ar.pdf
+ 
+ # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	-
+@@ -897,7 +897,7 @@ Rule	Morocco	2018	only	-	Jun	17	 2:00	1:00	-
+ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
+ 			 0:00	Morocco	+00/+01	1984 Mar 16
+ 			 1:00	-	+01	1986
+-			 0:00	Morocco	+00/+01	2018 Oct 27
++			 0:00	Morocco	+00/+01	2018 Oct 28  3:00
+ 			 1:00	-	+01
+ 
+ # Western Sahara
+@@ -913,7 +913,7 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
+ 
+ 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 27
++			 0:00	Morocco	+00/+01	2018 Oct 28  3:00
+ 			 1:00	-	+01
+ 
+ # Mozambique
+-- 
+2.17.1
+
diff --git a/sources b/sources
index 2198b31..d4eb179 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2018e.tar.gz) = 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717
-SHA512 (tzdata2018e.tar.gz) = d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae
+SHA512 (tzcode2018g.tar.gz) = 58f89b7323bfe795c5f13039f7527d18b15c9e37fce6e9fa1a402ce2689bf5c772cf1ffb86f23309814a563f9f429da472df1229818b07b1e04f16bdedb21484
+SHA512 (tzdata2018g.tar.gz) = 92e9bbd61f51be8f2cf7ec9491691e5e2f97803914dbad77b7fb8b6600ed68fc3b98450fc808bb2d4c6c835df5f9eb7bf4529d059d9b1370f2ab4c12e7f1adfa
diff --git a/tzdata.spec b/tzdata.spec
index 695fe54..9871e03 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,15 +1,16 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2018e
-%define tzdata_version 2018e
-%define tzcode_version 2018e
-Release: 2%{?dist}
+Version: 2018g
+%define tzdata_version 2018g
+%define tzcode_version 2018g
+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
 
+Patch001: 0001-Correct-tm_dst-during-Morocco-transition.patch
 Patch002: 0002-Fix-have-snprintf-error.patch
 
 BuildRequires: gawk, glibc, perl-interpreter
@@ -40,8 +41,28 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
+%patch001 -p1
 %patch002 -p1
 
+# Currently tzdata is providing the "rearguard" data set for maximum
+# compatibility with existing Red Hat Enterprise Linux installs. Future releases of
+# Red Hat Enterprise Linux will be transitioning to the default or "vanguard" tzdata
+# data set.
+#
+# The "rearguard" and "vanguard" data sets are defined by the upstream tzdata project
+# and represent approximately the same data, with "vanguard" optimized for newer time
+# zone data tooling, and "rearguard" optimized for compatibility with existing tooling.
+# For example "vanguard" implements support for negative DST offsets, while "rearguard"
+# supports the traditional format.
+
+# Create the reargard data files.
+make VERSION=%{version} tzdata%{version}-rearguard.tar.gz
+tar zxf tzdata%{version}-rearguard.tar.gz
+
+# Run make to re-create the tzdata.zi file for rearguard format
+rm tzdata.zi
+make VERSION=%{version} DATAFORM=rearguard tzdata.zi
+
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
 pushd javazic
@@ -69,8 +90,6 @@ tar xf %{SOURCE4}
 echo "%{name}%{tzdata_version}" >> VERSION
 
 %build
-# Run make to create the tzdata.zi file
-make tzdata.zi
 
 FILES="africa antarctica asia australasia europe northamerica southamerica
        pacificnew etcetera backward"
@@ -130,6 +149,17 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Mon Oct 29 2018 Patsy Griffin Franklin  - 2018g-1
+- Rebase to tzdata-2018g
+  - Morocco will remain at UTC+1 rather than switching back to UTC+0 as
+    planned.  This change is effective Octobober 28, 2018.
+- Include changes introduced in tzdata-2018f
+  - Volgograd will change from UTC+03 to UTC+04 on 2018-10-28 at 02:00.
+  - Fiji will end DST on 2019-01-13 instead of the 2019-01-20 as
+    previously predicted.
+  - Most of Chile will end DST on the first Saturday in April at 24:00
+    and restart DST on the first Saturday in September at 24:00.
+
 * Fri Sep 28 2018 Patsy Franklin  - 2018e-2
 - Add make check for testing.
 

From 655405f4a776673ff8cea7d4d7d42bfaba170940 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Wed, 2 Jan 2019 18:07:41 -0500
Subject: [PATCH 260/280] =?UTF-8?q?Resolves:=20#1662987=20-=20Rebase=20to?=
 =?UTF-8?q?=20tzdata-2018i=20(includes=20changes=20from=20tzdata-2018h)=20?=
 =?UTF-8?q?=20=20-=20S=C3=A3o=20Tom=C3=A9=20and=20Pr=C3=ADncipe=20changed?=
 =?UTF-8?q?=20from=20UTC+01=20to=20UTC+00=20on=202019-01-01.=20=20=20-=20Q?=
 =?UTF-8?q?yzylorda,=20Kazakhstan=20changed=20from=20UTC+06=20to=20UTC+05?=
 =?UTF-8?q?=20on=202018-12-21.=20=20=20-=20Created=20a=20new=20zone=20Asia?=
 =?UTF-8?q?/Qostanay=20since=20Qostanay,=20Kazakhstan=20didn't=20=20=20=20?=
 =?UTF-8?q?=20transition=20with=20the=20Qyzylorda=20change.=20=20=20-=20Me?=
 =?UTF-8?q?tlakatla,=20Alaska=20will=20observe=20PST=20for=20this=20winter?=
 =?UTF-8?q?=20only.=20=20=20-=20Predict=20that=20Morocco=20will=20continue?=
 =?UTF-8?q?=20to=20adjust=20clocks=20around=20Ramadan.=20=20=20-=20Also=20?=
 =?UTF-8?q?include=20predictions=20for=20Iran=20from=202038=20through=2020?=
 =?UTF-8?q?90.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 18 +++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index acb4ae4..d884dd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,3 +166,5 @@ noarch/
 /tzdata2018e.tar.gz
 /tzcode2018g.tar.gz
 /tzdata2018g.tar.gz
+/tzcode2018i.tar.gz
+/tzdata2018i.tar.gz
diff --git a/sources b/sources
index d4eb179..c893706 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2018g.tar.gz) = 58f89b7323bfe795c5f13039f7527d18b15c9e37fce6e9fa1a402ce2689bf5c772cf1ffb86f23309814a563f9f429da472df1229818b07b1e04f16bdedb21484
-SHA512 (tzdata2018g.tar.gz) = 92e9bbd61f51be8f2cf7ec9491691e5e2f97803914dbad77b7fb8b6600ed68fc3b98450fc808bb2d4c6c835df5f9eb7bf4529d059d9b1370f2ab4c12e7f1adfa
+SHA512 (tzcode2018i.tar.gz) = 1a3d53043f20b8252f7598f547d78e7294d9e0cf1fcdd2159354d9769f824c8c8a03cef9cbb7fa579345fdb41372335117d2ef782ecd9c107dd0526e59492d9d
+SHA512 (tzdata2018i.tar.gz) = 6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a
diff --git a/tzdata.spec b/tzdata.spec
index 9871e03..d2427c0 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2018g
-%define tzdata_version 2018g
-%define tzcode_version 2018g
+Version: 2018i
+%define tzdata_version 2018i
+%define tzcode_version 2018i
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -10,7 +10,6 @@ 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
 
-Patch001: 0001-Correct-tm_dst-during-Morocco-transition.patch
 Patch002: 0002-Fix-have-snprintf-error.patch
 
 BuildRequires: gawk, glibc, perl-interpreter
@@ -41,7 +40,6 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
-%patch001 -p1
 %patch002 -p1
 
 # Currently tzdata is providing the "rearguard" data set for maximum
@@ -149,6 +147,16 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Jan 02 2019 Patsy Griffin Franklin  - 2018i-1
+- Rebase to tzdata-2018i (includes changes from tzdata-2018h)
+  - São Tomé and Príncipe changed from UTC+01 to UTC+00 on 2019-01-01.
+  - Qyzylorda, Kazakhstan changed from UTC+06 to UTC+05 on 2018-12-21.
+  - Created a new zone Asia/Qostanay since Qostanay, Kazakhstan didn't 
+    transition with the Qyzylorda change.
+  - Metlakatla, Alaska will observe PST for this winter only.
+  - Predict that Morocco will continue to adjust clocks around Ramadan.
+  - Also include predictions for Iran from 2038 through 2090.
+
 * Mon Oct 29 2018 Patsy Griffin Franklin  - 2018g-1
 - Rebase to tzdata-2018g
   - Morocco will remain at UTC+1 rather than switching back to UTC+0 as

From 29bc70479014248f88423229c931aee6e86256ab Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 28 Mar 2019 11:03:30 -0400
Subject: [PATCH 261/280] Resolves: #1692613 - Rebase to tzdata-2019a   -
 Palestine will start DST on 2019-03-30, rather than 2019-03-23 as    
 previously predicted.   - Metlakatla rejoined Alaska time on 2019-01-20,
 ending its observances     of Pacific standard time.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 13 ++++++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index d884dd4..6b4a96a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -168,3 +168,5 @@ noarch/
 /tzdata2018g.tar.gz
 /tzcode2018i.tar.gz
 /tzdata2018i.tar.gz
+/tzcode2019a.tar.gz
+/tzdata2019a.tar.gz
diff --git a/sources b/sources
index c893706..4a48bae 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2018i.tar.gz) = 1a3d53043f20b8252f7598f547d78e7294d9e0cf1fcdd2159354d9769f824c8c8a03cef9cbb7fa579345fdb41372335117d2ef782ecd9c107dd0526e59492d9d
-SHA512 (tzdata2018i.tar.gz) = 6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a
+SHA512 (tzcode2019a.tar.gz) = 7cc76ce6be4a67c3e1b2222cb632d2de9dabb76899793a938f87a1d4bb20e462cabdae9e3b986aaabaa400795370510095d236dbad5aff4c192d0887f0ecedf5
+SHA512 (tzdata2019a.tar.gz) = d8eb5b2b68abee08bd2b0d2134bce85b5c0aee85168e9697a607604ed5be7d1539ac60fda9b37e0c9c793ef6251978bc250563a0af59497fde775499964bb5aa
diff --git a/tzdata.spec b/tzdata.spec
index d2427c0..afc383c 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2018i
-%define tzdata_version 2018i
-%define tzcode_version 2018i
+Version: 2019a
+%define tzdata_version 2019a
+%define tzcode_version 2019a
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -147,6 +147,13 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Mar 26 2019 Patsy Griffin Franklin  - 2019a-1
+- Rebase to tzdata-2019a
+  - Palestine will start DST on 2019-03-30, rather than 2019-03-23 as
+    previously predicted.
+  - Metlakatla rejoined Alaska time on 2019-01-20, ending its observances
+    of Pacific standard time.
+
 * Wed Jan 02 2019 Patsy Griffin Franklin  - 2018i-1
 - Rebase to tzdata-2018i (includes changes from tzdata-2018h)
   - São Tomé and Príncipe changed from UTC+01 to UTC+00 on 2019-01-01.

From 1bb6bbf29f2ee923d92e0ab4e5adf6a9f4860bce Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Tue, 2 Jul 2019 22:12:29 -0400
Subject: [PATCH 262/280] Resolves: #1726271 - Rebase to tzdata-2019b   -
 Brazil will no longer observe DST going forward.   - The 2019 spring
 transition for Palestine occurred 03-29, not 03-30.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6b4a96a..42e97c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -170,3 +170,5 @@ noarch/
 /tzdata2018i.tar.gz
 /tzcode2019a.tar.gz
 /tzdata2019a.tar.gz
+/tzcode2019b.tar.gz
+/tzdata2019b.tar.gz
diff --git a/sources b/sources
index 4a48bae..63c6133 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2019a.tar.gz) = 7cc76ce6be4a67c3e1b2222cb632d2de9dabb76899793a938f87a1d4bb20e462cabdae9e3b986aaabaa400795370510095d236dbad5aff4c192d0887f0ecedf5
-SHA512 (tzdata2019a.tar.gz) = d8eb5b2b68abee08bd2b0d2134bce85b5c0aee85168e9697a607604ed5be7d1539ac60fda9b37e0c9c793ef6251978bc250563a0af59497fde775499964bb5aa
+SHA512 (tzcode2019b.tar.gz) = bcfb417fe3b7c39e702da0090291db0489744f733010ae183007fce5e441bfce885fb25ed11730cf7f363572e107d7ff0c4b38691bb99def2d8cf7017c05720f
+SHA512 (tzdata2019b.tar.gz) = c0104078d994e501d80a41bea31364b1390a75c2fbf42968a8343a090e2ac2eddbc58770ca470b192ea19dec89fcc634141a1de703ea2ffa0325176a64afe1fc
diff --git a/tzdata.spec b/tzdata.spec
index afc383c..d8f5ee2 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2019a
-%define tzdata_version 2019a
-%define tzcode_version 2019a
+Version: 2019b
+%define tzdata_version 2019b
+%define tzcode_version 2019b
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -147,6 +147,11 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Mon Jul 01 2019 Patsy Griffin  - 2019b-1
+- Rebase to tzdata-2019b
+  - Brazil will no longer observe DST going forward.
+  - The 2019 spring transition for Palestine occurred 03-29, not 03-30.
+
 * Tue Mar 26 2019 Patsy Griffin Franklin  - 2019a-1
 - Rebase to tzdata-2019a
   - Palestine will start DST on 2019-03-30, rather than 2019-03-23 as

From 2c223d456ea3a17177bb9ac25391c0510b5cb553 Mon Sep 17 00:00:00 2001
From: Patsy Franklin 
Date: Thu, 12 Sep 2019 08:14:23 -0400
Subject: [PATCH 263/280] Resolves: #1751398 Rebase to tzdata-2019c - Fiji will
 observe DST from 2019-11-10 to 2020-01-12. - Norfolk Island will begin
 observing Australian-style DST on 2019-10-06.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 42e97c1..2f3f6b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -172,3 +172,5 @@ noarch/
 /tzdata2019a.tar.gz
 /tzcode2019b.tar.gz
 /tzdata2019b.tar.gz
+/tzcode2019c.tar.gz
+/tzdata2019c.tar.gz
diff --git a/sources b/sources
index 63c6133..5d6720f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2019b.tar.gz) = bcfb417fe3b7c39e702da0090291db0489744f733010ae183007fce5e441bfce885fb25ed11730cf7f363572e107d7ff0c4b38691bb99def2d8cf7017c05720f
-SHA512 (tzdata2019b.tar.gz) = c0104078d994e501d80a41bea31364b1390a75c2fbf42968a8343a090e2ac2eddbc58770ca470b192ea19dec89fcc634141a1de703ea2ffa0325176a64afe1fc
+SHA512 (tzcode2019c.tar.gz) = 61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b
+SHA512 (tzdata2019c.tar.gz) = 2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565
diff --git a/tzdata.spec b/tzdata.spec
index d8f5ee2..fccb683 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2019b
-%define tzdata_version 2019b
-%define tzcode_version 2019b
+Version: 2019c
+%define tzdata_version 2019c
+%define tzcode_version 2019c
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -147,6 +147,11 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Sep 11 2019 Patsy Griffin  - 2019c-1
+- Rebase to tzdata-2019c
+  - Fiji will observe DST from 2019-11-10 to 2020-01-12.
+  - Norfolk Island will begin observing Australian-style DST on 2019-10-06.
+
 * Mon Jul 01 2019 Patsy Griffin  - 2019b-1
 - Rebase to tzdata-2019b
   - Brazil will no longer observe DST going forward.

From c4ed6474484c7cac25c396738a7a936a2d45519a Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Fri, 24 Apr 2020 07:54:51 -0400
Subject: [PATCH 264/280] Resolves: #1824286 - Rebase to tzdata-2020a   -
 Morocco will spring forward on 2020-05-31 rather than     previously
 predicted 2020-05-24.   - Canada's Yukon region changed to year round UTC -07
     effective 2020-03-08.   - America/Godthab was renamed to America/Nuuk.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 14 +++++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f3f6b9..a3c2842 100644
--- a/.gitignore
+++ b/.gitignore
@@ -174,3 +174,5 @@ noarch/
 /tzdata2019b.tar.gz
 /tzcode2019c.tar.gz
 /tzdata2019c.tar.gz
+/tzcode2020a.tar.gz
+/tzdata2020a.tar.gz
diff --git a/sources b/sources
index 5d6720f..aee7575 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2019c.tar.gz) = 61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b
-SHA512 (tzdata2019c.tar.gz) = 2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565
+SHA512 (tzcode2020a.tar.gz) = 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2
+SHA512 (tzdata2020a.tar.gz) = 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d
diff --git a/tzdata.spec b/tzdata.spec
index fccb683..8ab7b61 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2019c
-%define tzdata_version 2019c
-%define tzcode_version 2019c
+Version: 2020a
+%define tzdata_version 2020a
+%define tzcode_version 2020a
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -147,6 +147,14 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Fri Apr 24 2020 Patsy Griffin  - 2020a-1
+- Rebase to tzdata-2020a
+  - Morocco will spring forward on 2020-05-31 rather than
+    previously predicted 2020-05-24.
+  - Canada's Yukon region changed to year round UTC -07
+    effective 2020-03-08.
+  - America/Godthab was renamed to America/Nuuk.
+
 * Wed Sep 11 2019 Patsy Griffin  - 2019c-1
 - Rebase to tzdata-2019c
   - Fiji will observe DST from 2019-11-10 to 2020-01-12.

From 11275cf4130692ad2c3c44f9c7db4fa44e7cf0b3 Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Fri, 9 Oct 2020 17:50:27 -0400
Subject: [PATCH 265/280] Resolves: #1884708 - Rebase to tzdata-2020b   - Yukon
 timezones represented by America/Whitehorse and     America/Dawson will
 change time zone rules from -08/-07 to     permanent -07 on 2020-11-01, not
 on 2020-03-08 as 2020a had it.   - The most recent winter(+08)/summer(+11)
 transition for Casey Station,     Antarctica was 2020-10-04 00:01.   - Remove
 obsolete files pacificnew, systemv, and yearistype.sh     from the
 distribution.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 18 ++++++++++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index a3c2842..7b2a10e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -176,3 +176,5 @@ noarch/
 /tzdata2019c.tar.gz
 /tzcode2020a.tar.gz
 /tzdata2020a.tar.gz
+/tzcode2020b.tar.gz
+/tzdata2020b.tar.gz
diff --git a/sources b/sources
index aee7575..e84890a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2020a.tar.gz) = 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2
-SHA512 (tzdata2020a.tar.gz) = 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d
+SHA512 (tzcode2020b.tar.gz) = 04849f196430717962cbeedf11bbba592c304eaff5d67350c936af83dc8e8cb4cedc1c5f461c984aef05124d6c0f13a874789dff77b85a4b399faf80d75537e0
+SHA512 (tzdata2020b.tar.gz) = 27ade698e61881e637ab04834633595cfbdb08fd97177e9731093165d1268a64dffa0570b5e137b9daa4374e6c6827ed01c476074ec61ec0b9a44a7f23479be9
diff --git a/tzdata.spec b/tzdata.spec
index 8ab7b61..035f760 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2020a
-%define tzdata_version 2020a
-%define tzcode_version 2020a
+Version: 2020b
+%define tzdata_version 2020b
+%define tzcode_version 2020b
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -90,7 +90,7 @@ echo "%{name}%{tzdata_version}" >> VERSION
 %build
 
 FILES="africa antarctica asia australasia europe northamerica southamerica
-       pacificnew etcetera backward"
+       etcetera backward"
 
 mkdir zoneinfo/{,posix,right}
 zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
@@ -147,6 +147,16 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Oct 07 2020 Patsy Griffin  - 2020b-1
+- Rebase to tzdata-2020b
+  - Yukon timezones represented by America/Whitehorse and
+    America/Dawson will change time zone rules from -08/-07 to
+    permanent -07 on 2020-11-01, not on 2020-03-08 as 2020a had it.
+  - The most recent winter(+08)/summer(+11) transition for Casey Station,
+    Antarctica was 2020-10-04 00:01.
+  - Remove obsolete files pacificnew, systemv, and yearistype.sh
+    from the distribution.
+
 * Fri Apr 24 2020 Patsy Griffin  - 2020a-1
 - Rebase to tzdata-2020a
   - Morocco will spring forward on 2020-05-31 rather than

From 5d4dfeecb780cb6e925490484492e5f15c4bfbc7 Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Tue, 13 Oct 2020 22:46:34 -0400
Subject: [PATCH 266/280] Resolves: #1884708 - Include the upstream patch to
 support pacificnew for java tzupdater. - Set POSIXRULES macro to continue
 installing posixrules file.

---
 ...my-pacificnew-into-rearguard-tarball.patch | 34 +++++++++++++++++++
 0003-continue-to-ship-posixrules.patch        | 13 +++++++
 tzdata.spec                                   | 12 +++++--
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 0001-Put-dummy-pacificnew-into-rearguard-tarball.patch
 create mode 100644 0003-continue-to-ship-posixrules.patch

diff --git a/0001-Put-dummy-pacificnew-into-rearguard-tarball.patch b/0001-Put-dummy-pacificnew-into-rearguard-tarball.patch
new file mode 100644
index 0000000..95818e5
--- /dev/null
+++ b/0001-Put-dummy-pacificnew-into-rearguard-tarball.patch
@@ -0,0 +1,34 @@
+From 0c8cac40a6ee69e106f3b034624890b98cad5b01 Mon Sep 17 00:00:00 2001
+From: Paul Eggert 
+Date: Mon, 12 Oct 2020 16:15:27 -0700
+Subject: [PROPOSED] Put dummy pacificnew into rearguard tarball
+
+Problem reported by Mike Cullinan in:
+https://mm.icann.org/pipermail/tz/2020-October/029309.html
+* Makefile (tzdata$(VERSION)-rearguard.tar.gz):
+Put an empty pacificnew file into the rearguard tarball.
+* NEWS: Mention this.
+---
+ Makefile | 6 +++++-
+ NEWS     | 7 +++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 28972c6..95f0a06 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1022,10 +1022,14 @@ tzdata$(VERSION)-rearguard.tar.gz: rearguard.zi set-timestamps.out
+ 		done
+ 		sed '1s/$$/-rearguard/' \
+ 		  tzdata$(VERSION)-rearguard.dir/version
++		: The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier.
++		touch -md 2020-10-12T22:53:00Z \
++		  tzdata$(VERSION)-rearguard.dir/pacificnew
+ 		touch -cmr version tzdata$(VERSION)-rearguard.dir/version
+ 		LC_ALL=C && export LC_ALL && \
+ 		  (cd tzdata$(VERSION)-rearguard.dir && \
+-		   tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \
++		   tar $(TARFLAGS) -cf - \
++			$(COMMON) $(DATA) $(MISC) pacificnew | \
+ 		     gzip $(GZIPFLAGS)) >$@.out
+ 		mv $@.out $@
diff --git a/0003-continue-to-ship-posixrules.patch b/0003-continue-to-ship-posixrules.patch
new file mode 100644
index 0000000..1755352
--- /dev/null
+++ b/0003-continue-to-ship-posixrules.patch
@@ -0,0 +1,13 @@
+diff -Nrup a/Makefile b/Makefile
+--- a/Makefile	2020-10-13 15:58:12.000000000 -0400
++++ b/Makefile	2020-10-13 16:03:09.461302282 -0400
+@@ -60,7 +60,7 @@ LOCALTIME=	GMT
+ #	make zonenames
+ # to get a list of the values you can use for POSIXRULES.
+ 
+-POSIXRULES=	-
++POSIXRULES=    America/New_York
+ 
+ # Also see TZDEFRULESTRING below, which takes effect only
+ # if the time zone files cannot be accessed.
+Binary files a/tzdata2020b-rearguard.tar.gz and b/tzdata2020b-rearguard.tar.gz differ
diff --git a/tzdata.spec b/tzdata.spec
index 035f760..43bf952 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,14 +3,16 @@ Name: tzdata
 Version: 2020b
 %define tzdata_version 2020b
 %define tzcode_version 2020b
-Release: 1%{?dist}
+Release: 2%{?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
 
+Patch001: 0001-Put-dummy-pacificnew-into-rearguard-tarball.patch
 Patch002: 0002-Fix-have-snprintf-error.patch
+Patch003: 0003-continue-to-ship-posixrules.patch
 
 BuildRequires: gawk, glibc, perl-interpreter
 BuildRequires: java-devel
@@ -40,7 +42,9 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
+%patch001 -p1
 %patch002 -p1
+%patch003 -p1
 
 # Currently tzdata is providing the "rearguard" data set for maximum
 # compatibility with existing Red Hat Enterprise Linux installs. Future releases of
@@ -90,7 +94,7 @@ echo "%{name}%{tzdata_version}" >> VERSION
 %build
 
 FILES="africa antarctica asia australasia europe northamerica southamerica
-       etcetera backward"
+       pacificnew etcetera backward"
 
 mkdir zoneinfo/{,posix,right}
 zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
@@ -147,6 +151,10 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Oct 13 2020 Patsy Griffin  - 2020b-2
+- Include the upstream patch to support pacificnew for java tzupdater.
+- Set POSIXRULES macro to continue installing posixrules file. 
+
 * Wed Oct 07 2020 Patsy Griffin  - 2020b-1
 - Rebase to tzdata-2020b
   - Yukon timezones represented by America/Whitehorse and

From b187d390319b2765dfe577e4d8b3d8dc27aa71fa Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Tue, 20 Oct 2020 14:17:18 -0400
Subject: [PATCH 267/280] Resolves: #1889356 Rebase to tzdata-2020c - Fiji
 starts DST later than usual, on 2020-12-20. - Rearguard now provides an empty
 file pacificnew to support   downstream software that expects it.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 16 ++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7b2a10e..13aba96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -178,3 +178,5 @@ noarch/
 /tzdata2020a.tar.gz
 /tzcode2020b.tar.gz
 /tzdata2020b.tar.gz
+/tzcode2020c.tar.gz
+/tzdata2020c.tar.gz
diff --git a/sources b/sources
index e84890a..b8e1b07 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2020b.tar.gz) = 04849f196430717962cbeedf11bbba592c304eaff5d67350c936af83dc8e8cb4cedc1c5f461c984aef05124d6c0f13a874789dff77b85a4b399faf80d75537e0
-SHA512 (tzdata2020b.tar.gz) = 27ade698e61881e637ab04834633595cfbdb08fd97177e9731093165d1268a64dffa0570b5e137b9daa4374e6c6827ed01c476074ec61ec0b9a44a7f23479be9
+SHA512 (tzcode2020c.tar.gz) = c77fa69d2a005ba7cff602b2267983fd01613f81385bc13c90b9581d69fb0ac73491641cac81e0e5d7dd00ed120c45103859902c2d10da9d25c98b33354f88f7
+SHA512 (tzdata2020c.tar.gz) = bbd66fe236ba0949261cb238bfed454c03b4500b239dc38f1b8fef8d229136f5964c1a8386fe54484e4e5e34a3c28a7b66ee7374ff7e0dd07865d78fc53bf96c
diff --git a/tzdata.spec b/tzdata.spec
index 43bf952..828273a 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,16 +1,15 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2020b
-%define tzdata_version 2020b
-%define tzcode_version 2020b
-Release: 2%{?dist}
+Version: 2020c
+%define tzdata_version 2020c
+%define tzcode_version 2020c
+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
 
-Patch001: 0001-Put-dummy-pacificnew-into-rearguard-tarball.patch
 Patch002: 0002-Fix-have-snprintf-error.patch
 Patch003: 0003-continue-to-ship-posixrules.patch
 
@@ -42,7 +41,6 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
-%patch001 -p1
 %patch002 -p1
 %patch003 -p1
 
@@ -151,6 +149,12 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Mon Oct 19 2020 Patsy Griffin  - 2020c-1
+- Rebase to tzdata-2020c
+  - Fiji starts DST later than usual, on 2020-12-20.
+  - Rearguard now provides an empty file pacificnew to support
+    downstream software that expects it.
+
 * Tue Oct 13 2020 Patsy Griffin  - 2020b-2
 - Include the upstream patch to support pacificnew for java tzupdater.
 - Set POSIXRULES macro to continue installing posixrules file. 

From 8ea7e78b0de6164d0f8bfbbd2854a1d319eaee7b Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Wed, 21 Oct 2020 16:04:28 -0400
Subject: [PATCH 268/280] Resolves: #1889356 Rebase to tzdata-2020d - Palestine
 will end summer time on 2020-10-24 rather than the   predicted 2020-10-31.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 13aba96..3d74293 100644
--- a/.gitignore
+++ b/.gitignore
@@ -180,3 +180,5 @@ noarch/
 /tzdata2020b.tar.gz
 /tzcode2020c.tar.gz
 /tzdata2020c.tar.gz
+/tzcode2020d.tar.gz
+/tzdata2020d.tar.gz
diff --git a/sources b/sources
index b8e1b07..fa3803d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2020c.tar.gz) = c77fa69d2a005ba7cff602b2267983fd01613f81385bc13c90b9581d69fb0ac73491641cac81e0e5d7dd00ed120c45103859902c2d10da9d25c98b33354f88f7
-SHA512 (tzdata2020c.tar.gz) = bbd66fe236ba0949261cb238bfed454c03b4500b239dc38f1b8fef8d229136f5964c1a8386fe54484e4e5e34a3c28a7b66ee7374ff7e0dd07865d78fc53bf96c
+SHA512 (tzcode2020d.tar.gz) = 315ce86574780d89482761298137b2871a21cb4391886abdc9f29c6cc09e8b8f6585f96d3f4dfef8d7b54e24720214f5c77144114ad58cc91aa5bbde350c0f9b
+SHA512 (tzdata2020d.tar.gz) = 362e4569a666b0776614be3f63f1fe3d5ae259055e7051c9875f36023db9c52b0c5a10c19067114443a4cf2bf92475f8a0aebdf79bac836d967527fcdea4e9b6
diff --git a/tzdata.spec b/tzdata.spec
index 828273a..1a9d4a9 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2020c
-%define tzdata_version 2020c
-%define tzcode_version 2020c
+Version: 2020d
+%define tzdata_version 2020d
+%define tzcode_version 2020d
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -149,6 +149,11 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Oct 21 2020 Patsy Griffin  - 2020d-1
+- Rebase to tzdata-2020d
+ - Palestine will end summer time on 2020-10-24 rather than the
+   predicted 2020-10-31.
+
 * Mon Oct 19 2020 Patsy Griffin  - 2020c-1
 - Rebase to tzdata-2020c
   - Fiji starts DST later than usual, on 2020-12-20.

From 5a9f3867c4542c59fd2ccf1e13c2c94bcf428834 Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Tue, 29 Dec 2020 23:41:18 -0500
Subject: [PATCH 269/280] Resolves: #1906902 Rebase to tzdata-2020f including
 changes for tzdata-2020e  - tzdata-2020f fixes a bug in tzdata-2020e that
 caused an    invalid zi file in rearguard format  - Volgograd changes time
 zone from UTC+04 to UTC+03 on 2020-12-27.  - Australia/Currie is identical to
 Australia/Hobart for all    timestamps since 1970 and was therefore created
 by mistake,    now moved to the "backward" file.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d74293..ead0bc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -182,3 +182,5 @@ noarch/
 /tzdata2020c.tar.gz
 /tzcode2020d.tar.gz
 /tzdata2020d.tar.gz
+/tzcode2020f.tar.gz
+/tzdata2020f.tar.gz
diff --git a/sources b/sources
index fa3803d..ce15cb3 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2020d.tar.gz) = 315ce86574780d89482761298137b2871a21cb4391886abdc9f29c6cc09e8b8f6585f96d3f4dfef8d7b54e24720214f5c77144114ad58cc91aa5bbde350c0f9b
-SHA512 (tzdata2020d.tar.gz) = 362e4569a666b0776614be3f63f1fe3d5ae259055e7051c9875f36023db9c52b0c5a10c19067114443a4cf2bf92475f8a0aebdf79bac836d967527fcdea4e9b6
+SHA512 (tzcode2020f.tar.gz) = 5f6bf1b508434842eb9dacacc744b5f3375c35b88e401ef372b5fde80ad2f523484fe52a6e99460e402230406ebf6a9261a97efde45a610f8e8085893d55c4ed
+SHA512 (tzdata2020f.tar.gz) = dd312def18c807452fda2e697514e2064c5f51ebdbedd0cfe6f231252c76ee5d4409f653b295ed5657b7d30b868690047fdb70a10942e69eaa40b77473e3f9ca
diff --git a/tzdata.spec b/tzdata.spec
index 1a9d4a9..2d48344 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2020d
-%define tzdata_version 2020d
-%define tzcode_version 2020d
+Version: 2020f
+%define tzdata_version 2020f
+%define tzcode_version 2020f
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -149,6 +149,15 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Dec 29 2020 Patsy Griffin  - 2020f-1
+- Rebase to tzdata-2020f including changes for tzdata-2020e
+  - tzdata-2020f fixes a bug in tzdata-2020e that caused an
+    invalid zi file in rearguard format
+  - Volgograd changes time zone from UTC+04 to UTC+03 on 2020-12-27.
+  - Australia/Currie is identical to Australia/Hobart for all
+    timestamps since 1970 and was therefore created by mistake,
+    now moved to the "backward" file.
+
 * Wed Oct 21 2020 Patsy Griffin  - 2020d-1
 - Rebase to tzdata-2020d
  - Palestine will end summer time on 2020-10-24 rather than the

From 6c957bbd5068cc19b01658b1e8a8f664c929f96b Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Mon, 25 Jan 2021 11:14:26 -0500
Subject: [PATCH 270/280] Resolves: #1919723 Rebase to tzdata-2021a - South
 Sudan will change from +03 to +02 on 2021-02-01.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 10 +++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index ead0bc0..62d3419 100644
--- a/.gitignore
+++ b/.gitignore
@@ -184,3 +184,5 @@ noarch/
 /tzdata2020d.tar.gz
 /tzcode2020f.tar.gz
 /tzdata2020f.tar.gz
+/tzcode2021a.tar.gz
+/tzdata2021a.tar.gz
diff --git a/sources b/sources
index ce15cb3..c532355 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2020f.tar.gz) = 5f6bf1b508434842eb9dacacc744b5f3375c35b88e401ef372b5fde80ad2f523484fe52a6e99460e402230406ebf6a9261a97efde45a610f8e8085893d55c4ed
-SHA512 (tzdata2020f.tar.gz) = dd312def18c807452fda2e697514e2064c5f51ebdbedd0cfe6f231252c76ee5d4409f653b295ed5657b7d30b868690047fdb70a10942e69eaa40b77473e3f9ca
+SHA512 (tzcode2021a.tar.gz) = bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45
+SHA512 (tzdata2021a.tar.gz) = 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3
diff --git a/tzdata.spec b/tzdata.spec
index 2d48344..28c31ae 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2020f
-%define tzdata_version 2020f
-%define tzcode_version 2020f
+Version: 2021a
+%define tzdata_version 2021a
+%define tzcode_version 2021a
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -149,6 +149,10 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Sun Jan 24 2021 Patsy Griffin  - 2021a-1
+- Rebase to tzdata-2021a
+  - South Sudan will change from +03 to +02 on 2021-02-01.
+
 * Tue Dec 29 2020 Patsy Griffin  - 2020f-1
 - Rebase to tzdata-2020f including changes for tzdata-2020e
   - tzdata-2020f fixes a bug in tzdata-2020e that caused an

From 617eaf8d7c5825a8be5501b70eba31c8f09f2594 Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Wed, 6 Oct 2021 17:36:29 -0400
Subject: [PATCH 271/280] Resolves: #2010125 Rebase to tzdata-2021c -
 supersedes tzdata-2021b - Revert most of 2021b changes to 'backward'. - Fix
 'zic -b fat' bug in pre-1970 32-bit data. - Fix two Link line typos. -
 Distribute SECURITY file. - Includes changes in tzdata-2021b: - Jordan now
 starts DST on February's last Thursday. - Samoa no longer observes DST. -
 Merge more location-based Zones whose timestamps agree since 1970. - Move
 some backward-compatibility links to 'backward'. - Rename Pacific/Enderbury
 to Pacific/Kanton. - Correct many pre-1993 transitions in Malawi, Portugal,
 etc. - zic now creates each output file or link atomically. - zic -L no
 longer omits the POSIX TZ string in its output. - zic fixes for truncation
 and leap second table expiration. - zic now follows POSIX for TZ strings
 using all-year DST. - Fix some localtime crashes and bugs in obscure cases. -
 zdump -v now outputs more-useful boundary cases. - tzfile.5 better matches a
 draft successor to RFC 8536.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 28 +++++++++++++++++++++++++---
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 62d3419..20585b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -186,3 +186,5 @@ noarch/
 /tzdata2020f.tar.gz
 /tzcode2021a.tar.gz
 /tzdata2021a.tar.gz
+/tzcode2021c.tar.gz
+/tzdata2021c.tar.gz
diff --git a/sources b/sources
index c532355..cadbc5d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2021a.tar.gz) = bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45
-SHA512 (tzdata2021a.tar.gz) = 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3
+SHA512 (tzcode2021c.tar.gz) = 9ed7677744058c58656b47d77d464bad6ef503f2892b53c6abe694e68e73fa123dfc5c11bbcbbb7798f0a6bf1da72b81f8f1c63670839b967e15e58d6d36adad
+SHA512 (tzdata2021c.tar.gz) = e8de3a17c38f530b2ec39605699742dd32da5ee92ecf64accaaa5b012a1dac51d1f594adc52660602c3425016520346ab6ad614fa475eb310e17ccdcae93e6ca
diff --git a/tzdata.spec b/tzdata.spec
index 28c31ae..105cb21 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2021a
-%define tzdata_version 2021a
-%define tzcode_version 2021a
+Version: 2021c
+%define tzdata_version 2021c
+%define tzcode_version 2021c
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -149,6 +149,28 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Oct 06 2021 Patsy Griffin  - 2021c-1
+- Rebase to tzdata-2021c - supersedes tzdata-2021b
+  - Revert most of 2021b changes to 'backward'.
+  - Fix 'zic -b fat' bug in pre-1970 32-bit data.
+  - Fix two Link line typos.
+  - Distribute SECURITY file.
+- Includes changes in tzdata-2021b
+  - Innclude patch for Mayen
+  - Jordan now starts DST on February's last Thursday.
+  - Samoa no longer observes DST.
+  - Merge more location-based Zones whose timestamps agree since 1970.
+  - Move some backward-compatibility links to 'backward'.
+  - Rename Pacific/Enderbury to Pacific/Kanton.
+  - Correct many pre-1993 transitions in Malawi, Portugal, etc.
+  - zic now creates each output file or link atomically.
+  - zic -L no longer omits the POSIX TZ string in its output.
+  - zic fixes for truncation and leap second table expiration.
+  - zic now follows POSIX for TZ strings using all-year DST.
+  - Fix some localtime crashes and bugs in obscure cases.
+  - zdump -v now outputs more-useful boundary cases.
+  - tzfile.5 better matches a draft successor to RFC 8536.
+
 * Sun Jan 24 2021 Patsy Griffin  - 2021a-1
 - Rebase to tzdata-2021a
   - South Sudan will change from +03 to +02 on 2021-02-01.

From 86e8ec5b718f9c9c71064604ecb515289a56dde3 Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Fri, 22 Oct 2021 17:17:14 -0400
Subject: [PATCH 272/280] Resolves: #2015252 - Rebase to tzdata-2021e -
 supersedes tzdata-2021d   - Pacific/Fiji suspended DST for the 2021/2022
 season.   - 'zic -r' now marks unspecified timestamps with "-00".   -
 Palestine will fall back 2021-10-29 at 01:00, rather     than the predicted
 2021-10-30.

---
 sources     |  4 ++--
 tzdata.spec | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sources b/sources
index cadbc5d..8307dce 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2021c.tar.gz) = 9ed7677744058c58656b47d77d464bad6ef503f2892b53c6abe694e68e73fa123dfc5c11bbcbbb7798f0a6bf1da72b81f8f1c63670839b967e15e58d6d36adad
-SHA512 (tzdata2021c.tar.gz) = e8de3a17c38f530b2ec39605699742dd32da5ee92ecf64accaaa5b012a1dac51d1f594adc52660602c3425016520346ab6ad614fa475eb310e17ccdcae93e6ca
+SHA512 (tzdata2021e.tar.gz) = c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119
+SHA512 (tzcode2021e.tar.gz) = 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a
diff --git a/tzdata.spec b/tzdata.spec
index 105cb21..d25a58f 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2021c
-%define tzdata_version 2021c
-%define tzcode_version 2021c
+Version: 2021e
+%define tzdata_version 2021e
+%define tzcode_version 2021e
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -149,6 +149,13 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Fri Oct 22 2021 Patsy Griffin  - 2021e-1
+- Rebase to tzdata-2021e - supersedes tzdata-2021d
+  - Pacific/Fiji suspended DST for the 2021/2022 season.
+  - 'zic -r' now marks unspecified timestamps with "-00".
+  - Palestine will fall back 2021-10-29 at 01:00, rather
+    than the predicted 2021-10-30.
+
 * Wed Oct 06 2021 Patsy Griffin  - 2021c-1
 - Rebase to tzdata-2021c - supersedes tzdata-2021b
   - Revert most of 2021b changes to 'backward'.

From a3f5be8d177a27fee6800193e684974561429df9 Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Mon, 21 Mar 2022 09:48:55 -0400
Subject: [PATCH 273/280] Resolves: #2065241 Rebase to tzdata-2022a - Palestine
 springs forward on 2022-03-27, not -03-26. - zdump -v now outputs better
 failure information - fixes for code that reads corrupted TZif data

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 12 +++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 20585b1..ff05bf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,3 +188,5 @@ noarch/
 /tzdata2021a.tar.gz
 /tzcode2021c.tar.gz
 /tzdata2021c.tar.gz
+/tzcode2022a.tar.gz
+/tzdata2022a.tar.gz
diff --git a/sources b/sources
index 8307dce..de0de07 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzdata2021e.tar.gz) = c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119
-SHA512 (tzcode2021e.tar.gz) = 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a
+SHA512 (tzcode2022a.tar.gz) = 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed
+SHA512 (tzdata2022a.tar.gz) = 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9
diff --git a/tzdata.spec b/tzdata.spec
index d25a58f..1934449 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2021e
-%define tzdata_version 2021e
-%define tzcode_version 2021e
+Version: 2022a
+%define tzdata_version 2022a
+%define tzcode_version 2022a
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -149,6 +149,12 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Mar 16 2022 Patsy Griffin  - 2022a-1
+- Rebase to tzdata-2022a
+  - Palestine springs forward on 2022-03-27, not -03-26.
+  - zdump -v now outputs better failure information
+  - fixes for code that reads corrupted TZif data
+
 * Fri Oct 22 2021 Patsy Griffin  - 2021e-1
 - Rebase to tzdata-2021e - supersedes tzdata-2021d
   - Pacific/Fiji suspended DST for the 2021/2022 season.

From 5facea0a69bc2d2543a15841617749a9c564e736 Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Mon, 4 Apr 2022 17:38:47 -0400
Subject: [PATCH 274/280] Resolves: #2066197 Rebase to tzdata-2022a - Palestine
 springs forward on 2022-03-27, not -03-26. - zdump -v now outputs better
 failure information - fixes for code that reads corrupted TZif data

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 12 +++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 20585b1..ff05bf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,3 +188,5 @@ noarch/
 /tzdata2021a.tar.gz
 /tzcode2021c.tar.gz
 /tzdata2021c.tar.gz
+/tzcode2022a.tar.gz
+/tzdata2022a.tar.gz
diff --git a/sources b/sources
index 8307dce..de0de07 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzdata2021e.tar.gz) = c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119
-SHA512 (tzcode2021e.tar.gz) = 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a
+SHA512 (tzcode2022a.tar.gz) = 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed
+SHA512 (tzdata2022a.tar.gz) = 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9
diff --git a/tzdata.spec b/tzdata.spec
index d25a58f..f71f549 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2021e
-%define tzdata_version 2021e
-%define tzcode_version 2021e
+Version: 2022a
+%define tzdata_version 2022a
+%define tzcode_version 2022a
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -149,6 +149,12 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Fri Apr 1 2022 Patsy Griffin  - 2022a-1
+- Rebase to tzdata-2022a
+  - Palestine springs forward on 2022-03-27, not -03-26.
+  - zdump -v now outputs better failure information
+  - fixes for code that reads corrupted TZif data
+
 * Fri Oct 22 2021 Patsy Griffin  - 2021e-1
 - Rebase to tzdata-2021e - supersedes tzdata-2021d
   - Pacific/Fiji suspended DST for the 2021/2022 season.

From e48d84f305abecff7e935da86a7d796a77211388 Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Tue, 5 Apr 2022 12:00:03 -0400
Subject: [PATCH 275/280] Resolves: #2066197 - Needed to update the release.

---
 tzdata.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index f71f549..b97f1cc 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2022a
 %define tzdata_version 2022a
 %define tzcode_version 2022a
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -149,6 +149,9 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Apr 5 2022 Patsy Griffin  - 2022a-2
+- Update the release for rebuild.
+
 * Fri Apr 1 2022 Patsy Griffin  - 2022a-1
 - Rebase to tzdata-2022a
   - Palestine springs forward on 2022-03-27, not -03-26.

From 39e8c1b00197c1e07ae2542904df0b75cf21efa3 Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Thu, 11 Aug 2022 14:34:31 -0400
Subject: [PATCH 276/280] Resolves: #2117032 Rebase to tzdata-2022b - Chile
 transitions to DST on 2022-09-11, not 2022-09-04 - 'make install' now
 defaults LOCALTIME to Factory rather than GMT - More zones that are the same
 since 1970 have been moved to backzone. - Include patch for awk workaround.

---
 .gitignore                       |   2 +
 0001-Work-around-awk-bug-1.patch | 153 +++++++++++++++++++++++++++++++
 sources                          |   6 +-
 tzdata.spec                      |  17 +++-
 4 files changed, 171 insertions(+), 7 deletions(-)
 create mode 100644 0001-Work-around-awk-bug-1.patch

diff --git a/.gitignore b/.gitignore
index ff05bf9..37d5af0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -190,3 +190,5 @@ noarch/
 /tzdata2021c.tar.gz
 /tzcode2022a.tar.gz
 /tzdata2022a.tar.gz
+/tzcode2022b.tar.gz
+/tzdata2022b.tar.gz
diff --git a/0001-Work-around-awk-bug-1.patch b/0001-Work-around-awk-bug-1.patch
new file mode 100644
index 0000000..304accc
--- /dev/null
+++ b/0001-Work-around-awk-bug-1.patch
@@ -0,0 +1,153 @@
+From e8171130f9b80ae3c75dfa5e96c47d5dbc0f4aae Mon Sep 17 00:00:00 2001
+From: Paul Eggert 
+Date: Wed, 10 Aug 2022 18:58:08 -0700
+Subject: [PROPOSED] Work around macOS awk bug
+
+* ziguard.awk: Replace every regular expression /ERE/ in ordinary
+contexts with ($0 ~ /ERE/), to work around a bug in macOS 13.0 awk.
+Problem reported by Deborah Goldsmith in:
+https://mm.icann.org/pipermail/tz/2022-August/031783.html
+---
+ NEWS        |  8 ++++++++
+ ziguard.awk | 37 ++++++++++++++++++++-----------------
+ 2 files changed, 28 insertions(+), 17 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 6a0d5c50..7291030a 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,5 +1,13 @@
+ News for the tz database
+ 
++Unreleased, experimental changes
++
++  Changes to code
++
++    Work around a bug in macOS 'awk' that broke commands like 'make
++    traditional_tarballs'.  (Problem reported by Deborah Goldsmith.)
++
++
+ Release 2022b - 2022-08-10 15:38:32 -0700
+ 
+   Briefly:
+diff --git a/ziguard.awk b/ziguard.awk
+index 0728baa5..0556cc4a 100644
+--- a/ziguard.awk
++++ b/ziguard.awk
+@@ -91,12 +91,13 @@ $1 == "#PACKRATLIST" && $2 == PACKRATLIST {
+ /^Zone/ { zone = $2 }
+ 
+ DATAFORM != "main" {
+-  in_comment = /^#/
++  in_comment = $0 ~ /^#/
+   uncomment = comment_out = 0
+ 
+   # If this line should differ due to Czechoslovakia using negative SAVE values,
+   # uncomment the desired version and comment out the undesired one.
+-  if (zone == "Europe/Prague" && /^#?[\t ]+[01]:00[\t ]/ && /1947 Feb 23/) {
++  if (zone == "Europe/Prague" && $0 ~ /^#?[\t ]+[01]:00[\t ]/ \
++      && $0 ~ /1947 Feb 23/) {
+     if (($(in_comment + 2) != "-") == (DATAFORM != "rearguard")) {
+       uncomment = in_comment
+     } else {
+@@ -106,9 +107,9 @@ DATAFORM != "main" {
+ 
+   # If this line should differ due to Ireland using negative SAVE values,
+   # uncomment the desired version and comment out the undesired one.
+-  Rule_Eire = /^#?Rule[\t ]+Eire[\t ]/
++  Rule_Eire = $0 ~ /^#?Rule[\t ]+Eire[\t ]/
+   Zone_Dublin_post_1968 \
+-    = (zone == "Europe/Dublin" && /^#?[\t ]+[01]:00[\t ]/ \
++    = (zone == "Europe/Dublin" && $0 ~ /^#?[\t ]+[01]:00[\t ]/ \
+        && (!$(in_comment + 4) || 1968 < $(in_comment + 4)))
+   if (Rule_Eire || Zone_Dublin_post_1968) {
+     if ((Rule_Eire \
+@@ -122,9 +123,9 @@ DATAFORM != "main" {
+ 
+   # If this line should differ due to Namibia using negative SAVE values,
+   # uncomment the desired version and comment out the undesired one.
+-  Rule_Namibia = /^#?Rule[\t ]+Namibia[\t ]/
++  Rule_Namibia = $0 ~ /^#?Rule[\t ]+Namibia[\t ]/
+   Zone_using_Namibia_rule \
+-    = (zone == "Africa/Windhoek" && /^#?[\t ]+[12]:00[\t ]/ \
++    = (zone == "Africa/Windhoek" && $0 ~ /^#?[\t ]+[12]:00[\t ]/ \
+        && ($(in_comment + 2) == "Namibia" \
+ 	   || ($(in_comment + 2) == "-" && $(in_comment + 3) == "CAT" \
+ 	       && ((1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \
+@@ -142,8 +143,8 @@ DATAFORM != "main" {
+ 
+   # If this line should differ due to Portugal benefiting from %z if supported,
+   # uncomment the desired version and comment out the undesired one.
+-  if (/^#?[\t ]+-[12]:00[\t ]+Port[\t ]+[%+-]/) {
+-    if (/%z/ == (DATAFORM == "vanguard")) {
++  if ($0 ~ /^#?[\t ]+-[12]:00[\t ]+Port[\t ]+[%+-]/) {
++    if (($0 ~ /%z/) == (DATAFORM == "vanguard")) {
+       uncomment = in_comment
+     } else {
+       comment_out = !in_comment
+@@ -164,8 +165,8 @@ DATAFORM != "main" {
+     sub(/-00CHANGE-TO-%z/, "-00")
+     sub(/[-+][^\t ]+CHANGE-TO-/, "")
+   } else {
+-    if (/^[^#]*%z/) {
+-      stdoff_column = 2 * /^Zone/ + 1
++    if ($0 ~ /^[^#]*%z/) {
++      stdoff_column = 2 * ($0 ~ /^Zone/) + 1
+       rules_column = stdoff_column + 1
+       stdoff = get_minutes($stdoff_column)
+       rules = $rules_column
+@@ -184,9 +185,9 @@ DATAFORM != "main" {
+ 	    dstoff = 20
+ 	  } else if (((rules == "Cook" || rules == "LH") && NF == 3) \
+ 		     || (rules == "Uruguay" \
+-			 && /[\t ](1942 Dec 14|1960|1970|1974 Dec 22)$/)) {
++			 && $0 ~ /[\t ](1942 Dec 14|1960|1970|1974 Dec 22)$/)) {
+ 	    dstoff = 30
+-	  } else if (rules == "Uruguay" && /[\t ]1974 Mar 10$/) {
++	  } else if (rules == "Uruguay" && $0 ~ /[\t ]1974 Mar 10$/) {
+ 	    dstoff = 90
+ 	  } else {
+ 	    dstoff = 60
+@@ -222,7 +223,7 @@ DATAFORM != "main" {
+       stdoff_subst[1] = rounded_stdoff
+     }
+   } else if (stdoff_subst[0]) {
+-    stdoff_column = 2 * /^Zone/ + 1
++    stdoff_column = 2 * ($0 ~ /^Zone/) + 1
+     stdoff_column_val = $stdoff_column
+     if (stdoff_column_val == stdoff_subst[0]) {
+       sub(stdoff_subst[0], stdoff_subst[1])
+@@ -233,7 +234,7 @@ DATAFORM != "main" {
+ 
+   # In rearguard form, change the Japan rule line with "Sat>=8 25:00"
+   # to "Sun>=9 1:00", to cater to zic before 2007 and to older Java.
+-  if (/^Rule/ && $2 == "Japan") {
++  if ($0 ~ /^Rule/ && $2 == "Japan") {
+     if (DATAFORM == "rearguard") {
+       if ($7 == "Sat>=8" && $8 == "25:00") {
+ 	sub(/Sat>=8/, "Sun>=9")
+@@ -250,7 +251,7 @@ DATAFORM != "main" {
+   # In rearguard form, change the Morocco lines with negative SAVE values
+   # to use positive SAVE values.
+   if ($2 == "Morocco") {
+-    if (/^Rule/) {
++    if ($0 ~ /^Rule/) {
+       if ($4 ~ /^201[78]$/ && $6 == "Oct") {
+ 	if (DATAFORM == "rearguard") {
+ 	  sub(/\t2018\t/, "\t2017\t")
+@@ -290,8 +291,10 @@ DATAFORM != "main" {
+ /^Zone/ {
+   packrat_ignored = FILENAME == PACKRATDATA && PACKRATLIST && !packratlist[$2];
+ }
+-packrat_ignored && !/^Rule/ {
+-  sub(/^/, "#")
++{
++  if (packrat_ignored && $0 !~ /^Rule/) {
++    sub(/^/, "#")
++  }
+ }
+ 
+ # If a Link line is followed by a Link or Zone line for the same data, comment
+-- 
+2.34.1
+
diff --git a/sources b/sources
index de0de07..79df009 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2022a.tar.gz) = 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed
-SHA512 (tzdata2022a.tar.gz) = 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9
+SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
+SHA512 (tzcode2022b.tar.gz) = 851622eb8e6dc8f8201bf05e1f7e411ca32b2ed0f4dc9f6b875f4482c05c4a3302259b78c3e8e2dadda52ae19d4d34ffa3463fee10f70fa3a8b08b19f1417f79
+SHA512 (tzdata2022b.tar.gz) = a51418cda50386bc2e82a26201178c282ec225e04867e70a47ef90f42371a4014c70bffebb52ac09ccd893dfa17b0acc782f31527b3579ebdc4a302a9367ddb1
diff --git a/tzdata.spec b/tzdata.spec
index b97f1cc..04b2e4a 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,15 +1,16 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2022a
-%define tzdata_version 2022a
-%define tzcode_version 2022a
-Release: 2%{?dist}
+Version: 2022b
+%define tzdata_version 2022b
+%define tzcode_version 2022b
+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
 
+Patch001: 0001-Work-around-awk-bug-1.patch
 Patch002: 0002-Fix-have-snprintf-error.patch
 Patch003: 0003-continue-to-ship-posixrules.patch
 
@@ -41,6 +42,7 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
+%patch001 -p1
 %patch002 -p1
 %patch003 -p1
 
@@ -149,6 +151,13 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Aug 10 2022 Patsy Griffin  - 2022b-1
+- Rebase to tzdata-2022b
+  - Chile transitions to DST on 2022-09-11, not 2022-09-04
+  - 'make install' now defaults LOCALTIME to Factory rather than GMT
+  - More zones that are the same since 1970 have been moved to backzone.
+  - Include patch for awk workaround.
+
 * Tue Apr 5 2022 Patsy Griffin  - 2022a-2
 - Update the release for rebuild.
 

From 1b4db3cb5c8e224cacedc6fcddc110e1abcee60c Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Tue, 16 Aug 2022 11:38:37 -0400
Subject: [PATCH 277/280] Resolves: #2117032 Rebase to tzdata-2022c -
 supersedes tzdata-2022b - Add a work-around for an awk bug in FreeBSD, macOS,
 etc. - Improve tzselect with respect to intercontinental Zones.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 13 ++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 37d5af0..9556651 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,3 +192,5 @@ noarch/
 /tzdata2022a.tar.gz
 /tzcode2022b.tar.gz
 /tzdata2022b.tar.gz
+/tzcode2022c.tar.gz
+/tzdata2022c.tar.gz
diff --git a/sources b/sources
index 79df009..e2d812f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
-SHA512 (tzcode2022b.tar.gz) = 851622eb8e6dc8f8201bf05e1f7e411ca32b2ed0f4dc9f6b875f4482c05c4a3302259b78c3e8e2dadda52ae19d4d34ffa3463fee10f70fa3a8b08b19f1417f79
-SHA512 (tzdata2022b.tar.gz) = a51418cda50386bc2e82a26201178c282ec225e04867e70a47ef90f42371a4014c70bffebb52ac09ccd893dfa17b0acc782f31527b3579ebdc4a302a9367ddb1
+SHA512 (tzcode2022c.tar.gz) = 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06
+SHA512 (tzdata2022c.tar.gz) = e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b
diff --git a/tzdata.spec b/tzdata.spec
index 04b2e4a..034579a 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2022b
-%define tzdata_version 2022b
-%define tzcode_version 2022b
+Version: 2022c
+%define tzdata_version 2022c
+%define tzcode_version 2022c
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -10,7 +10,6 @@ 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
 
-Patch001: 0001-Work-around-awk-bug-1.patch
 Patch002: 0002-Fix-have-snprintf-error.patch
 Patch003: 0003-continue-to-ship-posixrules.patch
 
@@ -42,7 +41,6 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
-%patch001 -p1
 %patch002 -p1
 %patch003 -p1
 
@@ -151,6 +149,11 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Aug 16 2022 Patsy Griffin  - 2022c-1
+- Rebase to tzdata-2022c - supersedes tzdata-2022b
+  - Add a work-around for an awk bug in FreeBSD, macOS, etc.
+  - Improve tzselect with respect to intercontinental Zones.
+
 * Wed Aug 10 2022 Patsy Griffin  - 2022b-1
 - Rebase to tzdata-2022b
   - Chile transitions to DST on 2022-09-11, not 2022-09-04

From 81a41370d7c3c18a00f7e34a32f1a1e74ecc12fa Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Mon, 31 Oct 2022 00:54:37 -0400
Subject: [PATCH 278/280] Resolves: #2138675 Rebase to tzdata-2022f - Mexico
 will stop observing DST except near the US border. - Chihuahua moved to -06
 year round starting on 2022-10-30. - Fiji no longer observes DST.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 12 +++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9556651..bf1c6c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -194,3 +194,5 @@ noarch/
 /tzdata2022b.tar.gz
 /tzcode2022c.tar.gz
 /tzdata2022c.tar.gz
+/tzcode2022f.tar.gz
+/tzdata2022f.tar.gz
diff --git a/sources b/sources
index e2d812f..4d59f62 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
-SHA512 (tzcode2022c.tar.gz) = 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06
-SHA512 (tzdata2022c.tar.gz) = e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b
+SHA512 (tzcode2022f.tar.gz) = 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b
+SHA512 (tzdata2022f.tar.gz) = 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6
diff --git a/tzdata.spec b/tzdata.spec
index 034579a..7b070f4 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2022c
-%define tzdata_version 2022c
-%define tzcode_version 2022c
+Version: 2022f
+%define tzdata_version 2022f
+%define tzcode_version 2022f
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -149,6 +149,12 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Mon Oct 31 2022 Patsy Griffin  - 2022f-1
+- Rebase to tzdata-2022f
+  - Mexico will stop observing DST except near the US border.
+  - Chihuahua moved to -06 year round starting on 2022-10-30.
+  - Fiji no longer observes DST.
+
 * Tue Aug 16 2022 Patsy Griffin  - 2022c-1
 - Rebase to tzdata-2022c - supersedes tzdata-2022b
   - Add a work-around for an awk bug in FreeBSD, macOS, etc.

From abb3438d4a17b7fc576614c4633808bbd648cd67 Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Tue, 29 Nov 2022 23:03:52 -0500
Subject: [PATCH 279/280] Resolves: #2149412 Rebase to tzdata-2022g - The
 northern edge of the Mexican state of Chihuahua will   change time zone to
 agree with nearby US locations on   2022-11-30. - Added a new Zone
 America/Ciudad_Juarez that splits from   America/Ojinaga.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 14 +++++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index bf1c6c6..2a5a02f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,3 +196,5 @@ noarch/
 /tzdata2022c.tar.gz
 /tzcode2022f.tar.gz
 /tzdata2022f.tar.gz
+/tzcode2022g.tar.gz
+/tzdata2022g.tar.gz
diff --git a/sources b/sources
index 4d59f62..e52827c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
-SHA512 (tzcode2022f.tar.gz) = 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b
-SHA512 (tzdata2022f.tar.gz) = 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6
+SHA512 (tzcode2022g.tar.gz) = 5188edd8d05238a88da734cf78fadfb57640d4db3e7a0a9dddd70e3071e16b6eebc2e2ab17109b7dafafae68abfbc857df481cfdc3ffe63f7eb1569ea0b5997a
+SHA512 (tzdata2022g.tar.gz) = 7f79394295e00e3a24ebdbf9af3bc454a65f432a93b517e7e96c7f9db9949f6f5fdae9892a9d3789ff44ae0eb1bfe4744d36976b4624659af951d26414f94e65
diff --git a/tzdata.spec b/tzdata.spec
index 7b070f4..53653e0 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2022f
-%define tzdata_version 2022f
-%define tzcode_version 2022f
+Version: 2022g
+%define tzdata_version 2022g
+%define tzcode_version 2022g
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -149,6 +149,14 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Nov 29 2022 Patsy Griffin  - 2022g-1
+- Rebase to tzdata-2022g
+  - The northern edge of the Mexican state of Chihuahua will
+    change time zone to agree with nearby US locations on
+    2022-11-30.
+  - Added a new Zone America/Ciudad_Juarez that splits from
+    America/Ojinaga.
+
 * Mon Oct 31 2022 Patsy Griffin  - 2022f-1
 - Rebase to tzdata-2022f
   - Mexico will stop observing DST except near the US border.

From 3066bd96edffaee0674498ab6a97e156b159c5da Mon Sep 17 00:00:00 2001
From: Patsy Griffin 
Date: Fri, 6 Jan 2023 11:04:44 -0500
Subject: [PATCH 280/280] Resolves: #2154109 - Include leap-seconds.list in
 tzdata install.

---
 tzdata.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tzdata.spec b/tzdata.spec
index 53653e0..3994d3b 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2022g
 %define tzdata_version 2022g
 %define tzcode_version 2022g
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -124,7 +124,7 @@ java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
 rm -fr $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}
 cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir}
-install -p -m 644 zone.tab zone1970.tab iso3166.tab leapseconds tzdata.zi $RPM_BUILD_ROOT%{_datadir}/zoneinfo
+install -p -m 644 zone.tab zone1970.tab iso3166.tab leap-seconds.list leapseconds tzdata.zi $RPM_BUILD_ROOT%{_datadir}/zoneinfo
 cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
 install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
@@ -149,6 +149,9 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Fri Jan 6 2023 Patsy Griffin  - 2022g-2
+- Include leap-seconds.list in tzdata install. (#2154109)
+
 * Tue Nov 29 2022 Patsy Griffin  - 2022g-1
 - Rebase to tzdata-2022g
   - The northern edge of the Mexican state of Chihuahua will