From 3b18de2c709da5bbdbbdc0b07fd624096f84281782ae35020ff0d1afa9f95d98 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 23 Oct 2009 19:16:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=8 --- iso3166-uk.diff | 11 +++ timezone.changes | 15 ++++ timezone.spec | 8 +- tzdata-argentina.diff | 191 ++++++++++++++++++++++++++++++++++++++++++ tzdata2009m.tar.gz | 3 - tzdata2009o.tar.gz | 3 + 6 files changed, 226 insertions(+), 5 deletions(-) create mode 100644 iso3166-uk.diff create mode 100644 tzdata-argentina.diff delete mode 100644 tzdata2009m.tar.gz create mode 100644 tzdata2009o.tar.gz diff --git a/iso3166-uk.diff b/iso3166-uk.diff new file mode 100644 index 0000000..a452c5e --- /dev/null +++ b/iso3166-uk.diff @@ -0,0 +1,11 @@ +--- iso3166.tab~ 2009-09-15 00:34:18.941351000 +0200 ++++ iso3166.tab 2009-09-15 00:34:31.010318000 +0200 +@@ -98,7 +98,7 @@ + FO Faroe Islands + FR France + GA Gabon +-GB Britain (UK) ++GB United Kingdom + GD Grenada + GE Georgia + GF French Guiana diff --git a/timezone.changes b/timezone.changes index 39bfc18..833c980 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Oct 23 19:21:09 CEST 2009 - pbaudis@suse.cz + +- update data to 2009o: + * DST changes: Asia/Karachi, Asia/Dhaka +- Apply a patch for changes in Argentina DST: Argentina is not + switching to DST, except America/Argentina/SanLuis; version number + modified to 2009oa to reflect the extra patch. + +------------------------------------------------------------------- +Tue Sep 15 00:35:41 CEST 2009 - pbaudis@suse.cz + +- The abbreviation definition of GB should be United Kingdom instead + of Britain (UK) [bnc#519410] + ------------------------------------------------------------------- Tue Sep 8 16:43:50 CEST 2009 - pbaudis@suse.cz diff --git a/timezone.spec b/timezone.spec index 09881b7..e309cd9 100644 --- a/timezone.spec +++ b/timezone.spec @@ -25,14 +25,16 @@ Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2009m +Version: 2009oa Release: 1 -Source: tzdata%{version}.tar.gz +Source: tzdata2009o.tar.gz Source1: tzcode2009k.tar.gz # COMMON-END Patch0: tzdata-china.diff Patch1: tzcode-zic.diff Patch2: tzcode-ksh.diff +Patch3: iso3166-uk.diff +Patch4: tzdata-argentina.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %global AREA Etc %global ZONE UTC @@ -48,6 +50,8 @@ can select an appropriate time zone for your system with YaST. %patch0 %patch1 %patch2 +%patch3 +%patch4 -p1 %build unset ${!LC_*} diff --git a/tzdata-argentina.diff b/tzdata-argentina.diff new file mode 100644 index 0000000..94684ab --- /dev/null +++ b/tzdata-argentina.diff @@ -0,0 +1,191 @@ +From tz-request@lecserver.nci.nih.gov Wed Oct 21 19:39:08 2009 +Return-Path: +X-Original-To: pasky@localhost +Delivered-To: pasky@localhost +Received: from machine.or.cz (unknown [IPv6:::1]) + by machine.or.cz (Postfix) with ESMTP id 0C9E4862018 + for ; Wed, 21 Oct 2009 19:39:08 +0200 (CEST) +Received: from imap.suse.de [195.135.221.39] + by machine.or.cz with IMAP (fetchmail-6.3.9-rc2) + for (single-drop); Wed, 21 Oct 2009 19:39:08 +0200 (CEST) +Received: from imap.suse.de ([unix socket]) + by imap-int (Cyrus v2.2.12) with LMTPA; + Wed, 21 Oct 2009 19:38:49 +0200 +X-Sieve: CMU Sieve 2.2 +Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (Client CN "relay.suse.de", Issuer "CAcert Class 3 Root" (verified OK)) + by imap.suse.de (Postfix) with ESMTP id 61CAA3C539BA + for ; Wed, 21 Oct 2009 19:38:49 +0200 (CEST) +Received: by relay2.suse.de (Postfix) + id 58BF818552E3; Wed, 21 Oct 2009 19:38:49 +0200 (CEST) +Received: from localhost (localhost [127.0.0.1]) + by relay2.suse.de (Postfix) with ESMTP id 4ACEC18552E0 + for ; Wed, 21 Oct 2009 19:38:49 +0200 (CEST) +Received: from relay2.suse.de ([127.0.0.1]) + by localhost (localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP + id 09031-17 for ; Wed, 21 Oct 2009 19:38:45 +0200 (CEST) +Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) + by relay2.suse.de (Postfix) with ESMTP id 8386018552E1 + for ; Wed, 21 Oct 2009 19:38:45 +0200 (CEST) +Received: from nihrelayxway2.hub.nih.gov (mailfwd.nih.gov [128.231.90.107]) + by mx2.suse.de (Postfix) with ESMTP id 49EA889B67 + for ; Wed, 21 Oct 2009 19:38:44 +0200 (CEST) +X-IronPortListener: NIH_Relay +X-SBRS: None +X-IronPort-AV: E=Sophos;i="4.44,598,1249272000"; + d="scan'208";a="163796258" +Received: from elsie.nci.nih.gov (HELO lecserver.nci.nih.gov) ([137.187.215.78]) + by nihrelayxway2.hub.nih.gov with ESMTP; 21 Oct 2009 13:38:43 -0400 +Received: from lecserver.nci.nih.gov (localhost [127.0.0.1]) + by lecserver.nci.nih.gov (8.13.6/8.13.6) with ESMTP id n9LHcgOD008937; + Wed, 21 Oct 2009 13:38:42 -0400 (EDT) +Received: (from olsona@localhost) + by lecserver.nci.nih.gov (8.13.6/8.13.6/Submit) id n9LHcTdQ008933; + Wed, 21 Oct 2009 13:38:29 -0400 (EDT) +Resent-Date: Wed, 21 Oct 2009 13:38:29 -0400 (EDT) +X-Authentication-Warning: lecserver.nci.nih.gov: olsona set sender to tz-request@elsie.nci.nih.gov using -f +X-IronPortListener: NON_CES-Inbound +X-SBRS: None +X-IronPort-Anti-Spam-Filtered: true +X-IronPort-Anti-Spam-Result: ApoEAF/j3kpDz5Gv/2dsb2JhbADFApdYhDEEhiA +Message-ID: <4ADF46FF.70001@baby.com.ar> +Date: Wed, 21 Oct 2009 14:38:07 -0300 +From: Mariano Absatz - El Baby +User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.23) Gecko/20090817 Lightning/0.9 Thunderbird/2.0.0.23 Mnenhy/0.7.6.666 +MIME-Version: 1.0 +To: tz@lecserver.nci.nih.gov +Subject: Re: proposed time zone packages for Argentina in general and San + Juan in particular +References: <200910211319.n9LDJ8FZ000494@lecserver.nci.nih.gov> +In-Reply-To: <200910211319.n9LDJ8FZ000494@lecserver.nci.nih.gov> +Content-Type: multipart/mixed; + boundary="------------000704020906060406060309" +Resent-Message-ID: <"hwDuFC.A.BLC.Jc03KB"@lecserver> +Resent-From: tz@elsie.nci.nih.gov +Reply-To: tz@elsie.nci.nih.gov +X-Mailing-List: archive/latest/4849 +X-Loop: tz@elsie.nci.nih.gov +Precedence: list +Resent-Sender: tz-request@elsie.nci.nih.gov +X-Virus-Scanned: by amavisd-new at localhost +X-Spam-Status: No, score=-3.999 tagged_above=-20 required=5 + tests=[BAYES_50=0.001, RCVD_IN_DNSWL_MED=-4] +X-Spam-Score: -3.999 +X-Spam-Level: +Status: RO +Content-Length: 3483 +Lines: 111 + +This is a multi-part message in MIME format. +--------------000704020906060406060309 +Content-Type: text/plain; charset=ISO-8859-1; format=flowed +Content-Transfer-Encoding: quoted-printable + +Arthur David Olson escribi=F3 el 21/10/09 10:19: +> Below you'll find proposed changes to the "southamerica" for Argentina;= + +> most of Argentina is not using DST in 2009-2010, but San Juan is. +> +> If no problems are found, the ftp package will be updated on 2009-10-26= +=2E +> =20 + +> +> *************** +> *** 560,565 **** +> --- 569,578 ---- +> -3:00 - ART +> # +> # San Luis (SL) +> +=20 +> + Rule SanLuis 2008 max - Mar Sun>=3D8 0:00 0 - +> + Rule SanLuis 2008 max - Oct Sun>=3D8 0:00 1:00 S +> +=20 +> Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31 +> -4:16:48 - CMT 1920 May +> -4:00 - ART 1930 Dec +> *************** +> *** 574,581 **** +> -3:00 - ART 2004 May 31 +> -4:00 - WART 2004 Jul 25 +> -3:00 Arg AR%sT 2008 Jan 21 +> ! -3:00 - ART 2009 Mar 15 +> ! -4:00 Arg WAR%sT +> =20 +Re. the subject: The changes affect San Luis and NOT San Juan (the data=20 +file does refer to San Luis). + + +Besides that, I found an error in the SanLuis rules... they should read: +Rule SanLuis 2008 max - Mar Sun>=3D8 0:00 0 - +Rule SanLuis 2007 max - Oct Sun>=3D8 0:00 1:00 = + S + +that is, the "second Sunday of October" rule must start in 2007 rather=20 +than 2008, otherwise, the moment the rules come into action (Jan 21,=20 +2008) DST (for WART) is not observed. + +I'm enclosing a patch to tzdata2009o with the correction made (only the=20 +rules, I didn't edit the comments). + +--=20 +Mariano Absatz - "El Baby" +baby@baby.com.ar +www.clueless.com.ar + + +-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-= +=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- +Tact is the knack of making a point without making an enemy. + Isaac Newton + English mathematician & physicist (1642 - 1727) +-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-= +=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- +* TagZilla 0.066 * http://tagzilla.mozdev.org + + +--------------000704020906060406060309 +Content-Type: text/x-patch; + name="tzdata-Argentina+SanLuis-2009o.patch" +Content-Transfer-Encoding: 7bit +Content-Disposition: inline; + filename="tzdata-Argentina+SanLuis-2009o.patch" + +diff -ur tzdata2009o/southamerica tzdata2009o_MODIF/southamerica +--- tzdata2009o/southamerica 2009-10-05 12:43:25.000000000 -0300 ++++ tzdata2009o_MODIF/southamerica 2009-10-21 14:35:40.000000000 -0300 +@@ -216,8 +216,8 @@ + # + + Rule Arg 2007 only - Dec 30 0:00 1:00 S +-Rule Arg 2008 max - Mar Sun>=15 0:00 0 - +-Rule Arg 2008 max - Oct Sun>=15 0:00 1:00 S ++Rule Arg 2008 2009 - Mar Sun>=15 0:00 0 - ++Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S + + # From Mariano Absatz (2004-05-21): + # Today it was officially published that the Province of Mendoza is changing +@@ -560,6 +560,9 @@ + -3:00 - ART + # + # San Luis (SL) ++Rule SanLuis 2008 max - Mar Sun>=8 0:00 0 - ++Rule SanLuis 2007 max - Oct Sun>=8 0:00 1:00 S ++ + Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31 + -4:16:48 - CMT 1920 May + -4:00 - ART 1930 Dec +@@ -574,8 +577,7 @@ + -3:00 - ART 2004 May 31 + -4:00 - WART 2004 Jul 25 + -3:00 Arg AR%sT 2008 Jan 21 +- -3:00 - ART 2009 Mar 15 +- -4:00 Arg WAR%sT ++ -4:00 SanLuis WAR%sT + # + # Santa Cruz (SC) + Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31 + +--------------000704020906060406060309-- + diff --git a/tzdata2009m.tar.gz b/tzdata2009m.tar.gz deleted file mode 100644 index a970048..0000000 --- a/tzdata2009m.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7609980204940ceaf74b5a48d15ea0c079eaec627e149cf3d986cfed268881fe -size 180717 diff --git a/tzdata2009o.tar.gz b/tzdata2009o.tar.gz new file mode 100644 index 0000000..57c5eb5 --- /dev/null +++ b/tzdata2009o.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fbd4053a4eb01b814799855e35a3c01743f98acf9fcd167522e6484a2edd7b7 +size 182254