From 705f06e6f8fa681e7fb2a8580c5e15e636a8b3c251e74531795b899554e7443b Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 21 Jan 2010 10:11:27 +0000
Subject: [PATCH] checked in (request 29837)

OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=15
---
 timezone.changes   | 15 ---------------
 timezone.spec      | 10 ++++------
 tzdata-china.diff  |  8 ++++----
 tzdata-dhaka.diff  | 19 -------------------
 tzdata2009p.tar.gz |  3 +++
 tzdata2009u.tar.gz |  3 ---
 6 files changed, 11 insertions(+), 47 deletions(-)
 delete mode 100644 tzdata-dhaka.diff
 create mode 100644 tzdata2009p.tar.gz
 delete mode 100644 tzdata2009u.tar.gz

diff --git a/timezone.changes b/timezone.changes
index e03687d..f17e1c8 100644
--- a/timezone.changes
+++ b/timezone.changes
@@ -1,18 +1,3 @@
--------------------------------------------------------------------
-Tue Jan  5 14:27:27 CET 2010 - pbaudis@suse.cz
-
-- update tzdata to 2009u:
-  * DST changes: Asia/Damascus, Asia/Dhaka, Pacific/Fiji
-  * GMT offset changes: some bases in Antartica
-  * New zones: Asia/Novokuznetsk
-  * Historical changes: Asia/Hong_Kong
-- typo fix in Asia/Dhaka Jun 2009 transition rule
-
--------------------------------------------------------------------
-Tue Dec  8 22:53:36 CET 2009 - jengelh@medozas.de
-
-- enable parallel building
-
 -------------------------------------------------------------------
 Tue Nov  3 19:14:45 UTC 2009 - coolo@novell.com
 
diff --git a/timezone.spec b/timezone.spec
index 2600a21..8284660 100644
--- a/timezone.spec
+++ b/timezone.spec
@@ -25,8 +25,8 @@ Group:          System/Base
 Url:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem, coreutils
 # COMMON-BEGIN
-Version:        2009u
-Release:        1
+Version:        2009p
+Release:        2
 Source:         tzdata%{version}.tar.gz
 Source1:        tzcode2009k.tar.gz
 # COMMON-END
@@ -34,7 +34,6 @@ Patch0:         tzdata-china.diff
 Patch1:         tzcode-zic.diff
 Patch2:         tzcode-ksh.diff
 Patch3:         iso3166-uk.diff
-Patch4:         tzdata-dhaka.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global AREA    Etc
 %global ZONE    UTC
@@ -51,7 +50,6 @@ can select an appropriate time zone for your system with YaST.
 %patch1
 %patch2
 %patch3
-%patch4 -p1
 
 %build
 unset ${!LC_*}
@@ -60,8 +58,8 @@ LC_ALL=POSIX
 AREA=%{AREA}
 ZONE=%{ZONE}
 export AREA LANG LC_ALL ZONE
-make %{?jobs:-j%jobs} TZDIR=%{_prefix}/share/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"'" AWK=awk
-make %{?jobs:-j%jobs} TZDIR=zoneinfo AWK=awk zones
+make TZDIR=%{_prefix}/share/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"'" AWK=awk
+make TZDIR=zoneinfo AWK=awk zones
 # Generate posixrules
 ./zic -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE}
 
diff --git a/tzdata-china.diff b/tzdata-china.diff
index fdd8706..7d77155 100644
--- a/tzdata-china.diff
+++ b/tzdata-china.diff
@@ -2,16 +2,16 @@ Index: asia
 ===================================================================
 --- asia.orig
 +++ asia
-@@ -533,6 +533,9 @@ Zone	Asia/Kashgar	5:03:56	-	LMT	1928 # o
- # The Japanese surrender of Hong Kong was signed 1945-09-15.
- # For lack of anything better, use start of those days as the transition times.
+@@ -351,6 +351,9 @@ Zone	Asia/Kashgar	5:03:56	-	LMT	1928 # o
+ 			5:00	-	KAST	1980 May
+ 			8:00	PRC	C%sT
  
 +# Nowadays, China Standard Time is known as "Beijing Time"
 +Zone	Asia/Beijing	8:00	PRC	C%sT
 +
  # Hong Kong (Xianggang)
  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
- Rule	HK	1941	only	-	Apr	1	3:30	1:00	S
+ Rule	HK	1946	only	-	Apr	20	3:30	1:00	S
 Index: backward
 ===================================================================
 --- backward.orig
diff --git a/tzdata-dhaka.diff b/tzdata-dhaka.diff
deleted file mode 100644
index 1af5f7c..0000000
--- a/tzdata-dhaka.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 7a01df85b44c994c09ac03b0694583e38542921d
-Author: Petr Baudis <pbaudis@suse.cz>
-Date:   Thu Jan 7 14:31:32 2010 +0100
-
-    Dhaka rule typo fix, from the mailing list
-
-Index: timezone-2009u/asia
-===================================================================
---- timezone-2009u.orig/asia
-+++ timezone-2009u/asia
-@@ -226,7 +226,7 @@ Zone	Asia/Bahrain	3:22:20 -	LMT	1920		#
- # establishment of a rule.
- 
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
--Rule	Dhaka	2009	only	-	Jun	29	23:00	1	S
-+Rule	Dhaka	2009	only	-	Jun	19	23:00	1	S
- Rule	Dhaka	2010	only	-	Jan	1	0:00	-	-
- Rule	Dhaka	2010	max	-	Mar	31	23:00	1	S
- Rule	Dhaka	2010	max	-	Nov	1	0:00	-	-
diff --git a/tzdata2009p.tar.gz b/tzdata2009p.tar.gz
new file mode 100644
index 0000000..98cb3e2
--- /dev/null
+++ b/tzdata2009p.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7182ad6f03bfe16ccdbac4a3efb9e765ea7c51afc33c3a7fefb053122aa6da2c
+size 182635
diff --git a/tzdata2009u.tar.gz b/tzdata2009u.tar.gz
deleted file mode 100644
index 28662fa..0000000
--- a/tzdata2009u.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7cbd82597590ca279e042dbeace91553806c4b4dbff25c34b843a4f1d07e0384
-size 185958