From 22515193cd91182a3463908e251e518ebb94f4ee53b61e66dc33d21ba8a61a06 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 16 Mar 2010 11:09:56 +0000 Subject: [PATCH] Accepting request 34772 from Base:System Copy from Base:System/timezone based on submit request 34772 from user coolo OBS-URL: https://build.opensuse.org/request/show/34772 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/timezone?expand=0&rev=27 --- timezone-java.changes | 5 +++++ timezone-java.spec | 6 +++--- timezone.changes | 5 +++++ timezone.spec | 10 +++++----- tzcode2009k.tar.gz | 3 --- tzcode2010c.tar.gz | 3 +++ tzdata-dhaka.diff | 19 ------------------- tzdata2009u.tar.gz | 3 --- tzdata2010e.tar.gz | 3 +++ 9 files changed, 24 insertions(+), 33 deletions(-) delete mode 100644 tzcode2009k.tar.gz create mode 100644 tzcode2010c.tar.gz delete mode 100644 tzdata-dhaka.diff delete mode 100644 tzdata2009u.tar.gz create mode 100644 tzdata2010e.tar.gz diff --git a/timezone-java.changes b/timezone-java.changes index e03687d..31fa2fc 100644 --- a/timezone-java.changes +++ b/timezone-java.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-java.spec b/timezone-java.spec index e3a1248..231dc4b 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -1,5 +1,5 @@ # -# spec file for package timezone-java (Version 2009u) +# spec file for package timezone-java (Version 2010e) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -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 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..21a05c8 100644 --- a/timezone.spec +++ b/timezone.spec @@ -1,5 +1,5 @@ # -# spec file for package timezone (Version 2009u) +# spec file for package timezone (Version 2010e) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -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/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 -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/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