From 3128609f98ca822dd752e2ec41a3598cdfd17dd8769b42da524f5d1ab652eccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 13 Aug 2012 12:46:17 +0000
Subject: [PATCH] Accepting request 130629 from Base:System
- update to 2012e:
* Pacific/Fakaofo: Tokelau is UTC+13, not UTC+14
- update to 2012e:
* Pacific/Fakaofo: Tokelau is UTC+13, not UTC+14
OBS-URL: https://build.opensuse.org/request/show/130629
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/timezone?expand=0&rev=62
---
timezone-java.changes | 6 ++++++
timezone-java.spec | 4 ++--
timezone.changes | 6 ++++++
timezone.spec | 4 ++--
tzcode-ksh.diff | 8 +++++---
tzcode2012c.tar.gz | 3 ---
tzcode2012e.tar.gz | 3 +++
tzdata2012d.tar.gz | 3 ---
tzdata2012e.tar.gz | 3 +++
9 files changed, 27 insertions(+), 13 deletions(-)
delete mode 100644 tzcode2012c.tar.gz
create mode 100644 tzcode2012e.tar.gz
delete mode 100644 tzdata2012d.tar.gz
create mode 100644 tzdata2012e.tar.gz
diff --git a/timezone-java.changes b/timezone-java.changes
index a709c24..b3032d5 100644
--- a/timezone-java.changes
+++ b/timezone-java.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 6 10:52:34 UTC 2012 - dmueller@suse.com
+
+- update to 2012e:
+ * Pacific/Fakaofo: Tokelau is UTC+13, not UTC+14
+
-------------------------------------------------------------------
Tue Jul 24 18:57:28 UTC 2012 - dmueller@suse.com
diff --git a/timezone-java.spec b/timezone-java.spec
index b359acd..e1ae501 100644
--- a/timezone-java.spec
+++ b/timezone-java.spec
@@ -25,10 +25,10 @@ License: BSD-3-Clause and SUSE-Public-Domain
Group: System/Base
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 2012d
+Version: 2012e
Release: 0
Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz
-Source1: ftp://ftp.iana.org/tz/releases/tzcode2012c.tar.gz
+Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz
Patch0: tzdata-china.diff
Patch1: tzcode-zic.diff
Patch2: tzcode-ksh.diff
diff --git a/timezone.changes b/timezone.changes
index a709c24..b3032d5 100644
--- a/timezone.changes
+++ b/timezone.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 6 10:52:34 UTC 2012 - dmueller@suse.com
+
+- update to 2012e:
+ * Pacific/Fakaofo: Tokelau is UTC+13, not UTC+14
+
-------------------------------------------------------------------
Tue Jul 24 18:57:28 UTC 2012 - dmueller@suse.com
diff --git a/timezone.spec b/timezone.spec
index 88dd87e..62c3b9b 100644
--- a/timezone.spec
+++ b/timezone.spec
@@ -23,10 +23,10 @@ Group: System/Base
Url: http://www.gnu.org/software/libc/libc.html
PreReq: filesystem, coreutils
# COMMON-BEGIN
-Version: 2012d
+Version: 2012e
Release: 0
Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz
-Source1: ftp://ftp.iana.org/tz/releases/tzcode2012c.tar.gz
+Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz
Patch0: tzdata-china.diff
Patch1: tzcode-zic.diff
Patch2: tzcode-ksh.diff
diff --git a/tzcode-ksh.diff b/tzcode-ksh.diff
index 011e5c8..4b282b9 100644
--- a/tzcode-ksh.diff
+++ b/tzcode-ksh.diff
@@ -1,10 +1,12 @@
---- Makefile
+Index: Makefile
+===================================================================
+--- Makefile.orig
+++ Makefile
-@@ -377,6 +377,7 @@
+@@ -376,6 +376,7 @@ date: $(DATEOBJS)
tzselect: tzselect.ksh
sed \
+ -e 's|#! /bin/ksh|#! /bin/sh|g' \
-e 's|AWK=[^}]*|AWK=$(AWK)|g' \
-e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
- -e 's|\(TZCODE_VERSION\)=.*|\1=$(TZCODE_VERSION)|' \
+ -e 's|\(TZVERSION\)=.*|\1=tz$(VERSION)|' \
diff --git a/tzcode2012c.tar.gz b/tzcode2012c.tar.gz
deleted file mode 100644
index 123b3bb..0000000
--- a/tzcode2012c.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f06d9f80707c7658a4646b8ff1fdf91c6f4c83085498aab5cc3ee6f7409bb7e8
-size 135542
diff --git a/tzcode2012e.tar.gz b/tzcode2012e.tar.gz
new file mode 100644
index 0000000..fa92c73
--- /dev/null
+++ b/tzcode2012e.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf0cb79e8419952ff4c6070394f6d45e809e3543b45944004962d4b4ee33a468
+size 135542
diff --git a/tzdata2012d.tar.gz b/tzdata2012d.tar.gz
deleted file mode 100644
index 141d262..0000000
--- a/tzdata2012d.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46c0e92a7aa89c3cfe571b585ceb6958bb444604aea3e09587f2cbe474c95575
-size 206219
diff --git a/tzdata2012e.tar.gz b/tzdata2012e.tar.gz
new file mode 100644
index 0000000..bb5cfa5
--- /dev/null
+++ b/tzdata2012e.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:061c1c289e792f3661135d5ec542e4f9417d3cd7f232f3d54c1949573aadd0fc
+size 206251