From 793d7240f6b9af1b4dd532314274977e746e502a Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@fedoraproject.org>
Date: Thu, 21 Sep 2006 14:03:39 +0000
Subject: [PATCH] - 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 <pmachata@redhat.com> - 2006l-1
+- Upstream 2006k, 2006l:
+  - Adjustments for Egypt, Palestine, Cuba, Honduras
+  - Documentation changes
+
 * Tue Aug 22 2006 Petr Machata <pmachata@redhat.com> - 2006j-1
 - Upstream 2006j
   - Honduras stopped observing DST on Monday at 00:00