From 6b9f9c6f19b7f5365d72d5b01d38c8564000f7ed692c8a60b7ffe3825cf80596 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 5 Nov 2012 12:06:43 +0000 Subject: [PATCH 1/2] - update to 2012i: * Cuba switches DST on November 4th - update to 2012i: * Cuba switches DST on November 4th OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=94 --- timezone-java.changes | 6 ++++++ timezone-java.spec | 2 +- timezone.changes | 6 ++++++ timezone.spec | 2 +- tzcode2012h.tar.gz | 3 --- tzcode2012i.tar.gz | 3 +++ tzdata2012h.tar.gz | 3 --- tzdata2012i.tar.gz | 3 +++ 8 files changed, 20 insertions(+), 8 deletions(-) delete mode 100644 tzcode2012h.tar.gz create mode 100644 tzcode2012i.tar.gz delete mode 100644 tzdata2012h.tar.gz create mode 100644 tzdata2012i.tar.gz diff --git a/timezone-java.changes b/timezone-java.changes index 46ed8f2..46aa593 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 5 12:06:12 UTC 2012 - dmueller@suse.com + +- update to 2012i: + * Cuba switches DST on November 4th + ------------------------------------------------------------------- Sat Oct 27 10:38:41 UTC 2012 - dmueller@suse.com diff --git a/timezone-java.spec b/timezone-java.spec index efda3ad..a1483ac 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -25,7 +25,7 @@ License: BSD-3-Clause and SUSE-Public-Domain Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2012h +Version: 2012i Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz diff --git a/timezone.changes b/timezone.changes index 46ed8f2..46aa593 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 5 12:06:12 UTC 2012 - dmueller@suse.com + +- update to 2012i: + * Cuba switches DST on November 4th + ------------------------------------------------------------------- Sat Oct 27 10:38:41 UTC 2012 - dmueller@suse.com diff --git a/timezone.spec b/timezone.spec index 5e81d4f..ea77088 100644 --- a/timezone.spec +++ b/timezone.spec @@ -23,7 +23,7 @@ Group: System/Base Url: http://www.iana.org/time-zones PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2012h +Version: 2012i Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz diff --git a/tzcode2012h.tar.gz b/tzcode2012h.tar.gz deleted file mode 100644 index e86a757..0000000 --- a/tzcode2012h.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:711883468d59bd20a51faf2abd96219f1ba2390b903e55901c86159530d5bf39 -size 135077 diff --git a/tzcode2012i.tar.gz b/tzcode2012i.tar.gz new file mode 100644 index 0000000..020bc1b --- /dev/null +++ b/tzcode2012i.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae658de3d2d3332401f599e1cedb109fbf3dac05d8becdc09f7524dbf0cda162 +size 135435 diff --git a/tzdata2012h.tar.gz b/tzdata2012h.tar.gz deleted file mode 100644 index 5a488ac..0000000 --- a/tzdata2012h.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65e53218eff4f71f8e7eaa0ae52aecec79e0ba186bd5badc27c099118d4cd065 -size 213675 diff --git a/tzdata2012i.tar.gz b/tzdata2012i.tar.gz new file mode 100644 index 0000000..a9c11f7 --- /dev/null +++ b/tzdata2012i.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9e5b6b6a2031236126409b3595cd8e1a730febc1e8b3802fdbdb417977cf162 +size 213961 From aca20b10808d9bb02daa82a7ef792f34ce17ab2595af04ee81c602314a14087b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 5 Nov 2012 12:10:32 +0000 Subject: [PATCH 2/2] - tzcode-ksh.diff: Obsolete, upstream uses bash now by default - tzcode-ksh.diff: Obsolete, upstream uses bash now by default OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=95 --- timezone-java.changes | 1 + timezone-java.spec | 2 -- timezone.changes | 1 + timezone.spec | 2 -- tzcode-ksh.diff | 12 ------------ 5 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 tzcode-ksh.diff diff --git a/timezone-java.changes b/timezone-java.changes index 46aa593..3176151 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -3,6 +3,7 @@ Mon Nov 5 12:06:12 UTC 2012 - dmueller@suse.com - update to 2012i: * Cuba switches DST on November 4th +- tzcode-ksh.diff: Obsolete, upstream uses bash now by default ------------------------------------------------------------------- Sat Oct 27 10:38:41 UTC 2012 - dmueller@suse.com diff --git a/timezone-java.spec b/timezone-java.spec index a1483ac..b1aa7ef 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -31,7 +31,6 @@ Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.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 Patch3: iso3166-uk.diff Patch4: tzcode-link.diff Patch5: tzcode-symlink.patch @@ -55,7 +54,6 @@ package is intended for Java Virtual Machine based on OpenJDK. # COMMON-PREP-BEGIN %patch0 %patch1 -%patch2 %patch3 %if 0%{?suse_version} < 1220 %patch4 diff --git a/timezone.changes b/timezone.changes index 46aa593..3176151 100644 --- a/timezone.changes +++ b/timezone.changes @@ -3,6 +3,7 @@ Mon Nov 5 12:06:12 UTC 2012 - dmueller@suse.com - update to 2012i: * Cuba switches DST on November 4th +- tzcode-ksh.diff: Obsolete, upstream uses bash now by default ------------------------------------------------------------------- Sat Oct 27 10:38:41 UTC 2012 - dmueller@suse.com diff --git a/timezone.spec b/timezone.spec index ea77088..b42ca4a 100644 --- a/timezone.spec +++ b/timezone.spec @@ -29,7 +29,6 @@ Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.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 Patch3: iso3166-uk.diff Patch4: tzcode-link.diff Patch5: tzcode-symlink.patch @@ -49,7 +48,6 @@ can select an appropriate time zone for your system with YaST. # COMMON-PREP-BEGIN %patch0 %patch1 -%patch2 %patch3 %if 0%{?suse_version} < 1220 %patch4 diff --git a/tzcode-ksh.diff b/tzcode-ksh.diff deleted file mode 100644 index 77e192d..0000000 --- a/tzcode-ksh.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: Makefile -=================================================================== ---- Makefile.orig -+++ Makefile -@@ -385,6 +385,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|\(TZVERSION\)=.*|\1=tz$(VERSION)|' \