From d1e55e4682455f15107d303ebb4e6f1df756563c Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@fedoraproject.org>
Date: Wed, 26 Mar 2008 13:31:04 +0000
Subject: [PATCH] - 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 <pmachata@redhat.com> - 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 <pmachata@redhat.com> - 2007k-2
 - Chile moves DST to 29/Mar
 - Related: #435959