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-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 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 9742ee4..9093a3b 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: 3%{?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,13 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Mon Apr 13 2009 Petr Machata - 2009e-3 +- 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 + * 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