From dcae2ac06a9249015aaab9bfcabe4c32833559739ef3940bb558e8d7a1c9f8c6 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 25 Jul 2012 14:20:50 +0000 Subject: [PATCH] Accepting request 128920 from Base:System - update to 2012d (bnc#771369): * Morocco DST is interrupted during Ramadan 2012 (July 20th- August 19th) - update to 2012d (bnc#771369): * Morocco DST is interrupted during Ramadan 2012 (July 20th- August 19th) OBS-URL: https://build.opensuse.org/request/show/128920 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/timezone?expand=0&rev=61 --- timezone-java.changes | 7 +++++++ timezone-java.spec | 6 +++--- timezone.changes | 7 +++++++ timezone.spec | 6 +++--- tzcode-ksh.diff | 8 +++----- tzcode2012b.tar.gz | 3 --- tzcode2012c.tar.gz | 3 +++ tzdata2012c.tar.gz | 3 --- tzdata2012d.tar.gz | 3 +++ 9 files changed, 29 insertions(+), 17 deletions(-) delete mode 100644 tzcode2012b.tar.gz create mode 100644 tzcode2012c.tar.gz delete mode 100644 tzdata2012c.tar.gz create mode 100644 tzdata2012d.tar.gz diff --git a/timezone-java.changes b/timezone-java.changes index eaca3a7..a709c24 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 24 18:57:28 UTC 2012 - dmueller@suse.com + +- update to 2012d (bnc#771369): + * Morocco DST is interrupted during Ramadan 2012 + (July 20th- August 19th) + ------------------------------------------------------------------- Mon Apr 2 16:19:16 CEST 2012 - dmueller@suse.de diff --git a/timezone-java.spec b/timezone-java.spec index 23e9b67..b359acd 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: 2012c +Version: 2012d Release: 0 -Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz -Source1: ftp://munnari.oz.au/pub/tzcode2012b.tar.gz +Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz +Source1: ftp://ftp.iana.org/tz/releases/tzcode2012c.tar.gz Patch0: tzdata-china.diff Patch1: tzcode-zic.diff Patch2: tzcode-ksh.diff diff --git a/timezone.changes b/timezone.changes index eaca3a7..a709c24 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 24 18:57:28 UTC 2012 - dmueller@suse.com + +- update to 2012d (bnc#771369): + * Morocco DST is interrupted during Ramadan 2012 + (July 20th- August 19th) + ------------------------------------------------------------------- Mon Apr 2 16:19:16 CEST 2012 - dmueller@suse.de diff --git a/timezone.spec b/timezone.spec index 9165c3c..88dd87e 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: 2012c +Version: 2012d Release: 0 -Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz -Source1: ftp://munnari.oz.au/pub/tzcode2012b.tar.gz +Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz +Source1: ftp://ftp.iana.org/tz/releases/tzcode2012c.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 1d01b19..011e5c8 100644 --- a/tzcode-ksh.diff +++ b/tzcode-ksh.diff @@ -1,12 +1,10 @@ -Index: Makefile -=================================================================== ---- Makefile.orig +--- Makefile +++ Makefile -@@ -357,6 +357,7 @@ date: $(DATEOBJS) +@@ -377,6 +377,7 @@ 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)|' \ diff --git a/tzcode2012b.tar.gz b/tzcode2012b.tar.gz deleted file mode 100644 index 2bcffdb..0000000 --- a/tzcode2012b.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4345a2de239a7b6e5ab286052cc269eb07d63798ae14ba715eb4c6bdfa0f3350 -size 135075 diff --git a/tzcode2012c.tar.gz b/tzcode2012c.tar.gz new file mode 100644 index 0000000..123b3bb --- /dev/null +++ b/tzcode2012c.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f06d9f80707c7658a4646b8ff1fdf91c6f4c83085498aab5cc3ee6f7409bb7e8 +size 135542 diff --git a/tzdata2012c.tar.gz b/tzdata2012c.tar.gz deleted file mode 100644 index b0bbf01..0000000 --- a/tzdata2012c.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33e19e1dd27bda5239812587d72971509a15b59baff7abd692b77ff66f168a82 -size 206206 diff --git a/tzdata2012d.tar.gz b/tzdata2012d.tar.gz new file mode 100644 index 0000000..141d262 --- /dev/null +++ b/tzdata2012d.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46c0e92a7aa89c3cfe571b585ceb6958bb444604aea3e09587f2cbe474c95575 +size 206219