From f41f50307fdf28f33bf2493d0907f2c0c862ada5c867070fa6a99039ac43b3ee Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Mon, 15 Mar 2010 10:17:38 +0000
Subject: [PATCH] Accepting request 34739 from
 home:elvigia:branches:Base:System

Copy from home:elvigia:branches:Base:System/timezone via accept of submit request 34739 revision 2.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/34739
OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=17
---
 timezone-java.spec | 11 +++++++----
 timezone.changes   |  5 +++++
 timezone.spec      |  8 ++++----
 tzcode2009k.tar.gz |  3 ---
 tzcode2010c.tar.gz |  3 +++
 tzdata2009u.tar.gz |  3 ---
 tzdata2010e.tar.gz |  3 +++
 7 files changed, 22 insertions(+), 14 deletions(-)
 delete mode 100644 tzcode2009k.tar.gz
 create mode 100644 tzcode2010c.tar.gz
 delete mode 100644 tzdata2009u.tar.gz
 create mode 100644 tzdata2010e.tar.gz

diff --git a/timezone-java.spec b/timezone-java.spec
index e3a1248..0ec2d3b 100644
--- a/timezone-java.spec
+++ b/timezone-java.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package timezone-java (Version 2009u)
+# spec file for package timezone-java (Version 2008h)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,10 +25,10 @@ Summary:        Timezone Descriptions
 Group:          System/Base
 # COMMON-BEGIN
 # COMMON-BEGIN
-Version:        2009u
+Version:        2010e
 Release:        1
 Source:         tzdata%{version}.tar.gz
-Source1:        tzcode2009k.tar.gz
+Source1:        tzcode2010c.tar.gz
 # COMMON-END
 # COMMON-END
 Url:            http://www.gnu.org/software/libc/libc.html
@@ -63,3 +63,6 @@ cp -a javazi $RPM_BUILD_ROOT%{_datadir}
 %{_datadir}/javazi
 
 %changelog
+* Mon Sep 29 2008 mvyskocil@suse.cz
+- Moved the timezone-java to separate specfile (adrian's request for better
+  bootstrapping of SUSE)
diff --git a/timezone.changes b/timezone.changes
index e03687d..31fa2fc 100644
--- a/timezone.changes
+++ b/timezone.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Mar 14 13:04:16 UTC 2010 - crrodriguez@opensuse.org
+
+- Update to 2010u, including Chile's emergency DST changes
+
 -------------------------------------------------------------------
 Tue Jan  5 14:27:27 CET 2010 - pbaudis@suse.cz
 
diff --git a/timezone.spec b/timezone.spec
index 9f26a9f..0a3ab4a 100644
--- a/timezone.spec
+++ b/timezone.spec
@@ -25,16 +25,16 @@ Group:          System/Base
 Url:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem, coreutils
 # COMMON-BEGIN
-Version:        2009u
+Version:        2010e
 Release:        1
 Source:         tzdata%{version}.tar.gz
-Source1:        tzcode2009k.tar.gz
+Source1:        tzcode2010c.tar.gz
 # COMMON-END
 Patch0:         tzdata-china.diff
 Patch1:         tzcode-zic.diff
 Patch2:         tzcode-ksh.diff
 Patch3:         iso3166-uk.diff
-Patch4:         tzdata-dhaka.diff
+#Patch4:         tzdata-dhaka.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global AREA    Etc
 %global ZONE    UTC
@@ -51,7 +51,7 @@ can select an appropriate time zone for your system with YaST.
 %patch1
 %patch2
 %patch3
-%patch4 -p1
+#%patch4 -p1
 
 %build
 unset ${!LC_*}
diff --git a/tzcode2009k.tar.gz b/tzcode2009k.tar.gz
deleted file mode 100644
index c767098..0000000
--- a/tzcode2009k.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2581f4ce19b11e4218ad0b2859679485af1cefe036f52643c8fb20024c8f5d45
-size 190353
diff --git a/tzcode2010c.tar.gz b/tzcode2010c.tar.gz
new file mode 100644
index 0000000..e6363cf
--- /dev/null
+++ b/tzcode2010c.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1921ca7aee62700875af443d9ee40eb822f800bc3da131a1917d4c103784b324
+size 191464
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
diff --git a/tzdata2010e.tar.gz b/tzdata2010e.tar.gz
new file mode 100644
index 0000000..1607c99
--- /dev/null
+++ b/tzdata2010e.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09ebe8787560ef0a0b8b27a115d0d79d4b9e4ed9d48e768426c59ad18b73abd6
+size 187452