From 0d5b9f8130baa9f78c6339b65b4a429271b1dd9f Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@fedoraproject.org>
Date: May 30 2008 10:43:43 +0000
Subject: - 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
- Resolves: #448645

---

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-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 8524404..0000000
--- a/tzdata-karachi.patch
+++ /dev/null
@@ -1,13 +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
-Only in tzdata-pm/tzdata2008b: asia~
diff --git a/tzdata.spec b/tzdata.spec
index 72c05e9..d300c28 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,14 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed May 30 2008 Petr Machata <pmachata@redhat.com> - 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
+- Resolves: #448645
+
 * Tue May 27 2008 Petr Machata <pmachata@redhat.com> - 2008b-3
 - Morocco introduces DST