Upstream now has the Pakistan change.

This commit is contained in:
Petr Machata 2009-04-13 14:08:59 +00:00
parent b8cf1e2fda
commit 9136b9db3f
5 changed files with 12 additions and 21 deletions

View File

@ -22,3 +22,4 @@ tzdata2009d.tar.gz
tzcode2009d.tar.gz
tzdata2009e.tar.gz
tzcode2009e.tar.gz
tzdata2009f.tar.gz

View File

@ -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

View File

@ -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):

View File

@ -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

View File

@ -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 <pmachata@redhat.com> - 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 <pmachata@redhat.com> - 2009e-3
- Bump up for rebuild