From f41f50307fdf28f33bf2493d0907f2c0c862ada5c867070fa6a99039ac43b3ee Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 15 Mar 2010 10:17:38 +0000 Subject: [PATCH 1/8] Accepting request 34739 from home:elvigia:branches:Base:System Copy from home:elvigia:branches:Base:System/timezone via accept of submit request 34739 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/34739 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=17 --- timezone-java.spec | 11 +++++++---- timezone.changes | 5 +++++ timezone.spec | 8 ++++---- tzcode2009k.tar.gz | 3 --- tzcode2010c.tar.gz | 3 +++ tzdata2009u.tar.gz | 3 --- tzdata2010e.tar.gz | 3 +++ 7 files changed, 22 insertions(+), 14 deletions(-) delete mode 100644 tzcode2009k.tar.gz create mode 100644 tzcode2010c.tar.gz delete mode 100644 tzdata2009u.tar.gz create mode 100644 tzdata2010e.tar.gz diff --git a/timezone-java.spec b/timezone-java.spec index e3a1248..0ec2d3b 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -1,7 +1,7 @@ # -# spec file for package timezone-java (Version 2009u) +# spec file for package timezone-java (Version 2008h) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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 @@ -63,3 +63,6 @@ cp -a javazi $RPM_BUILD_ROOT%{_datadir} %{_datadir}/javazi %changelog +* Mon Sep 29 2008 mvyskocil@suse.cz +- Moved the timezone-java to separate specfile (adrian's request for better + bootstrapping of SUSE) 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..0a3ab4a 100644 --- a/timezone.spec +++ b/timezone.spec @@ -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/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 From 3f7dfb7cecbd49f402fc4ac3db06837bd2874bf0fcaa50ac35950eef7184afad Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 16 Mar 2010 11:09:55 +0000 Subject: [PATCH 2/8] Accepting request 34772 from Base:System checked in (request 34772) OBS-URL: https://build.opensuse.org/request/show/34772 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=18 --- timezone-java.spec | 11 ++++------- timezone.changes | 5 ----- timezone.spec | 8 ++++---- tzcode2009k.tar.gz | 3 +++ tzcode2010c.tar.gz | 3 --- tzdata2009u.tar.gz | 3 +++ tzdata2010e.tar.gz | 3 --- 7 files changed, 14 insertions(+), 22 deletions(-) create mode 100644 tzcode2009k.tar.gz delete mode 100644 tzcode2010c.tar.gz create mode 100644 tzdata2009u.tar.gz delete mode 100644 tzdata2010e.tar.gz diff --git a/timezone-java.spec b/timezone-java.spec index 0ec2d3b..e3a1248 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -1,7 +1,7 @@ # -# spec file for package timezone-java (Version 2008h) +# spec file for package timezone-java (Version 2009u) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,10 +25,10 @@ Summary: Timezone Descriptions Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2010e +Version: 2009u Release: 1 Source: tzdata%{version}.tar.gz -Source1: tzcode2010c.tar.gz +Source1: tzcode2009k.tar.gz # COMMON-END # COMMON-END Url: http://www.gnu.org/software/libc/libc.html @@ -63,6 +63,3 @@ cp -a javazi $RPM_BUILD_ROOT%{_datadir} %{_datadir}/javazi %changelog -* Mon Sep 29 2008 mvyskocil@suse.cz -- Moved the timezone-java to separate specfile (adrian's request for better - bootstrapping of SUSE) diff --git a/timezone.changes b/timezone.changes index 31fa2fc..e03687d 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 0a3ab4a..9f26a9f 100644 --- a/timezone.spec +++ b/timezone.spec @@ -25,16 +25,16 @@ Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2010e +Version: 2009u Release: 1 Source: tzdata%{version}.tar.gz -Source1: tzcode2010c.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-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 new file mode 100644 index 0000000..c767098 --- /dev/null +++ b/tzcode2009k.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2581f4ce19b11e4218ad0b2859679485af1cefe036f52643c8fb20024c8f5d45 +size 190353 diff --git a/tzcode2010c.tar.gz b/tzcode2010c.tar.gz deleted file mode 100644 index e6363cf..0000000 --- a/tzcode2010c.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1921ca7aee62700875af443d9ee40eb822f800bc3da131a1917d4c103784b324 -size 191464 diff --git a/tzdata2009u.tar.gz b/tzdata2009u.tar.gz new file mode 100644 index 0000000..28662fa --- /dev/null +++ b/tzdata2009u.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7cbd82597590ca279e042dbeace91553806c4b4dbff25c34b843a4f1d07e0384 +size 185958 diff --git a/tzdata2010e.tar.gz b/tzdata2010e.tar.gz deleted file mode 100644 index 1607c99..0000000 --- a/tzdata2010e.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09ebe8787560ef0a0b8b27a115d0d79d4b9e4ed9d48e768426c59ad18b73abd6 -size 187452 From 6f853b7d357352280112ba172f92d5f7ba8cb86a0c1b87d1709b1f256ff5e5e2 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Thu, 18 Mar 2010 18:32:52 +0000 Subject: [PATCH 3/8] - cleanup; changes since 2009u are: * DST changes: Asia/Dhaka (yet again), Pacific/Fiji, Pacific/Apia, America/Santiago, Pacific/Easter, America/Asuncion * New zones: America/Matamoros, America/Ojinaga, America/Santa_Isabel - fix up previous changes entry OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=19 --- ready | 0 timezone-java.changes | 15 ---------- timezone-java.spec | 65 ------------------------------------------- timezone.changes | 14 ++++++++++ timezone.spec | 10 +++---- tzcode2009k.tar.gz | 3 -- tzdata-dhaka.diff | 19 ------------- tzdata2009u.tar.gz | 3 -- tzdata2010e.tar.gz | 3 ++ 9 files changed, 21 insertions(+), 111 deletions(-) delete mode 100644 ready delete mode 100644 timezone-java.spec delete mode 100644 tzcode2009k.tar.gz delete mode 100644 tzdata-dhaka.diff delete mode 100644 tzdata2009u.tar.gz create mode 100644 tzdata2010e.tar.gz diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/timezone-java.changes b/timezone-java.changes index e03687d..f17e1c8 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Tue Jan 5 14:27:27 CET 2010 - pbaudis@suse.cz - -- update tzdata to 2009u: - * DST changes: Asia/Damascus, Asia/Dhaka, Pacific/Fiji - * GMT offset changes: some bases in Antartica - * New zones: Asia/Novokuznetsk - * Historical changes: Asia/Hong_Kong -- typo fix in Asia/Dhaka Jun 2009 transition rule - -------------------------------------------------------------------- -Tue Dec 8 22:53:36 CET 2009 - jengelh@medozas.de - -- enable parallel building - ------------------------------------------------------------------- Tue Nov 3 19:14:45 UTC 2009 - coolo@novell.com diff --git a/timezone-java.spec b/timezone-java.spec deleted file mode 100644 index e3a1248..0000000 --- a/timezone-java.spec +++ /dev/null @@ -1,65 +0,0 @@ -# -# spec file for package timezone-java (Version 2009u) -# -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild - - -Name: timezone-java -BuildRequires: fastjar gcc-gij javazic -License: Public Domain, Freeware -Summary: Timezone Descriptions -Group: System/Base -# COMMON-BEGIN -# COMMON-BEGIN -Version: 2009u -Release: 1 -Source: tzdata%{version}.tar.gz -Source1: tzcode2009k.tar.gz -# COMMON-END -# COMMON-END -Url: http://www.gnu.org/software/libc/libc.html -PreReq: filesystem, coreutils -BuildArch: noarch -Provides: tzdata-java = %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -These are configuration files that describe available time zones - this -package is intended for Java Virtual Machine based on OpenJDK. - - - -%prep -%setup -c - -%build -gij -jar %{_javadir}/javazic.jar -V %{version} \ - -d javazi \ - africa antarctica asia australasia europe northamerica pacificnew \ - southamerica backward etcetera solar87 solar88 solar89 systemv \ - %{_datadir}/javazic/tzdata_jdk/gmt \ - %{_datadir}/javazic/tzdata_jdk/jdk11_backward - -%install -install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir} -cp -a javazi $RPM_BUILD_ROOT%{_datadir} - -%files -%defattr(-,root,root) -%{_datadir}/javazi - -%changelog diff --git a/timezone.changes b/timezone.changes index e03687d..a5fec38 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Mar 18 17:07:37 CET 2010 - pbaudis@suse.cz + +- cleanup; changes since 2009u are: + * DST changes: Asia/Dhaka (yet again), Pacific/Fiji, Pacific/Apia, + America/Santiago, Pacific/Easter, America/Asuncion + * New zones: America/Matamoros, America/Ojinaga, America/Santa_Isabel + +------------------------------------------------------------------- +Sun Mar 14 13:04:16 UTC 2010 - crrodriguez@opensuse.org + +- Update to 2010e, including Chile's emergency DST changes +- Update code to 2010c - mostly just cleanups + ------------------------------------------------------------------- Tue Jan 5 14:27:27 CET 2010 - pbaudis@suse.cz diff --git a/timezone.spec b/timezone.spec index 9f26a9f..b7e9ef9 100644 --- a/timezone.spec +++ b/timezone.spec @@ -1,7 +1,7 @@ # -# spec file for package timezone (Version 2009u) +# spec file for package timezone (Version 2009p) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,16 +25,15 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build %global AREA Etc %global ZONE UTC @@ -51,7 +50,6 @@ can select an appropriate time zone for your system with YaST. %patch1 %patch2 %patch3 -%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/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 From 196513deac6eba242a8877694ed6c5f427fb441e944f14e8cc3b44ff29f12b30 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Thu, 18 Mar 2010 18:34:03 +0000 Subject: [PATCH 4/8] add errorneously removed file OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=20 --- tzcode2010c.tar.gz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tzcode2010c.tar.gz 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 From a3f0d1b41b8a0fe46f3a09542c0400eae272356db3229bde3ccad22235452855 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Tue, 6 Apr 2010 14:14:41 +0000 Subject: [PATCH 5/8] - update tzdata to 2010h: * DST changes: Asia/Dhaka (again...), Asia/Karachi, Asia/Gaza, Asia/Damascus, Pacific/Apia * GMT offset changes: Europe/Samara, Asia/Kamchatka, Asia/Anadyr * Various Antarctica timezone changes OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=21 --- timezone.changes | 10 ++++++++++ timezone.spec | 2 +- tzdata2010e.tar.gz | 3 --- tzdata2010h.tar.gz | 3 +++ 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 tzdata2010e.tar.gz create mode 100644 tzdata2010h.tar.gz diff --git a/timezone.changes b/timezone.changes index a5fec38..865aa2c 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Apr 6 15:55:48 CEST 2010 - pbaudis@suse.cz + +- update tzdata to 2010h: + + * DST changes: Asia/Dhaka (again...), Asia/Karachi, Asia/Gaza, + Asia/Damascus, Pacific/Apia + * GMT offset changes: Europe/Samara, Asia/Kamchatka, Asia/Anadyr + * Various Antarctica timezone changes + ------------------------------------------------------------------- Thu Mar 18 17:07:37 CET 2010 - pbaudis@suse.cz diff --git a/timezone.spec b/timezone.spec index b7e9ef9..c80aab9 100644 --- a/timezone.spec +++ b/timezone.spec @@ -25,7 +25,7 @@ Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2010e +Version: 2010h Release: 1 Source: tzdata%{version}.tar.gz Source1: tzcode2010c.tar.gz diff --git a/tzdata2010e.tar.gz b/tzdata2010e.tar.gz deleted file mode 100644 index 1607c99..0000000 --- a/tzdata2010e.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09ebe8787560ef0a0b8b27a115d0d79d4b9e4ed9d48e768426c59ad18b73abd6 -size 187452 diff --git a/tzdata2010h.tar.gz b/tzdata2010h.tar.gz new file mode 100644 index 0000000..48ce14b --- /dev/null +++ b/tzdata2010h.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4918d60f63440ba9b6050205881e8a98d718dc0c2b7df5955f43e781eab6e7d +size 188402 From 88422af08924437d272044a97f71fc81b2caf8247b9dec4a913f4e9300f051f5 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Tue, 6 Apr 2010 14:58:59 +0000 Subject: [PATCH 6/8] Add missed-out Africa/Tunis changes entry OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=22 --- timezone.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/timezone.changes b/timezone.changes index 865aa2c..c0992eb 100644 --- a/timezone.changes +++ b/timezone.changes @@ -4,7 +4,7 @@ Tue Apr 6 15:55:48 CEST 2010 - pbaudis@suse.cz - update tzdata to 2010h: * DST changes: Asia/Dhaka (again...), Asia/Karachi, Asia/Gaza, - Asia/Damascus, Pacific/Apia + Asia/Damascus, Pacific/Apia, Africa/Tunis * GMT offset changes: Europe/Samara, Asia/Kamchatka, Asia/Anadyr * Various Antarctica timezone changes From 6713e820843e8b0119154b7c8429dcff3ce79ecd93727ed8675830335416a311 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 7 Apr 2010 19:21:45 +0000 Subject: [PATCH 7/8] Accepting request 37208 from Base:System checked in (request 37208) OBS-URL: https://build.opensuse.org/request/show/37208 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=23 --- timezone-java.changes | 20 +++++++++++++ timezone-java.spec | 65 +++++++++++++++++++++++++++++++++++++++++++ timezone.changes | 21 +------------- timezone.spec | 8 ++++-- tzdata2010e.tar.gz | 3 ++ tzdata2010h.tar.gz | 3 -- 6 files changed, 94 insertions(+), 26 deletions(-) create mode 100644 timezone-java.spec create mode 100644 tzdata2010e.tar.gz delete mode 100644 tzdata2010h.tar.gz diff --git a/timezone-java.changes b/timezone-java.changes index f17e1c8..31fa2fc 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +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 + +- update tzdata to 2009u: + * DST changes: Asia/Damascus, Asia/Dhaka, Pacific/Fiji + * GMT offset changes: some bases in Antartica + * New zones: Asia/Novokuznetsk + * Historical changes: Asia/Hong_Kong +- typo fix in Asia/Dhaka Jun 2009 transition rule + +------------------------------------------------------------------- +Tue Dec 8 22:53:36 CET 2009 - jengelh@medozas.de + +- enable parallel building + ------------------------------------------------------------------- Tue Nov 3 19:14:45 UTC 2009 - coolo@novell.com diff --git a/timezone-java.spec b/timezone-java.spec new file mode 100644 index 0000000..231dc4b --- /dev/null +++ b/timezone-java.spec @@ -0,0 +1,65 @@ +# +# spec file for package timezone-java (Version 2010e) +# +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + + +Name: timezone-java +BuildRequires: fastjar gcc-gij javazic +License: Public Domain, Freeware +Summary: Timezone Descriptions +Group: System/Base +# COMMON-BEGIN +# COMMON-BEGIN +Version: 2010e +Release: 1 +Source: tzdata%{version}.tar.gz +Source1: tzcode2010c.tar.gz +# COMMON-END +# COMMON-END +Url: http://www.gnu.org/software/libc/libc.html +PreReq: filesystem, coreutils +BuildArch: noarch +Provides: tzdata-java = %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +These are configuration files that describe available time zones - this +package is intended for Java Virtual Machine based on OpenJDK. + + + +%prep +%setup -c + +%build +gij -jar %{_javadir}/javazic.jar -V %{version} \ + -d javazi \ + africa antarctica asia australasia europe northamerica pacificnew \ + southamerica backward etcetera solar87 solar88 solar89 systemv \ + %{_datadir}/javazic/tzdata_jdk/gmt \ + %{_datadir}/javazic/tzdata_jdk/jdk11_backward + +%install +install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir} +cp -a javazi $RPM_BUILD_ROOT%{_datadir} + +%files +%defattr(-,root,root) +%{_datadir}/javazi + +%changelog diff --git a/timezone.changes b/timezone.changes index c0992eb..31fa2fc 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,26 +1,7 @@ -------------------------------------------------------------------- -Tue Apr 6 15:55:48 CEST 2010 - pbaudis@suse.cz - -- update tzdata to 2010h: - - * DST changes: Asia/Dhaka (again...), Asia/Karachi, Asia/Gaza, - Asia/Damascus, Pacific/Apia, Africa/Tunis - * GMT offset changes: Europe/Samara, Asia/Kamchatka, Asia/Anadyr - * Various Antarctica timezone changes - -------------------------------------------------------------------- -Thu Mar 18 17:07:37 CET 2010 - pbaudis@suse.cz - -- cleanup; changes since 2009u are: - * DST changes: Asia/Dhaka (yet again), Pacific/Fiji, Pacific/Apia, - America/Santiago, Pacific/Easter, America/Asuncion - * New zones: America/Matamoros, America/Ojinaga, America/Santa_Isabel - ------------------------------------------------------------------- Sun Mar 14 13:04:16 UTC 2010 - crrodriguez@opensuse.org -- Update to 2010e, including Chile's emergency DST changes -- Update code to 2010c - mostly just cleanups +- 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 c80aab9..21a05c8 100644 --- a/timezone.spec +++ b/timezone.spec @@ -1,7 +1,7 @@ # -# spec file for package timezone (Version 2009p) +# spec file for package timezone (Version 2010e) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2010h +Version: 2010e Release: 1 Source: tzdata%{version}.tar.gz Source1: tzcode2010c.tar.gz @@ -34,6 +34,7 @@ Patch0: tzdata-china.diff Patch1: tzcode-zic.diff Patch2: tzcode-ksh.diff Patch3: iso3166-uk.diff +#Patch4: tzdata-dhaka.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %global AREA Etc %global ZONE UTC @@ -50,6 +51,7 @@ can select an appropriate time zone for your system with YaST. %patch1 %patch2 %patch3 +#%patch4 -p1 %build unset ${!LC_*} 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 diff --git a/tzdata2010h.tar.gz b/tzdata2010h.tar.gz deleted file mode 100644 index 48ce14b..0000000 --- a/tzdata2010h.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4918d60f63440ba9b6050205881e8a98d718dc0c2b7df5955f43e781eab6e7d -size 188402 From dbb81b72c13bef0bb4f6898d4222cfb789b6b2ecd009fe40214558a8a1414d11 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 7 Apr 2010 19:21:47 +0000 Subject: [PATCH 8/8] Updating link to change in openSUSE:Factory/timezone revision 29.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=17a378d2377695d624f79bbfa4cd68fe --- timezone-java.changes | 21 ++++++++++++++++++++- timezone-java.spec | 4 ++-- timezone.changes | 21 ++++++++++++++++++++- timezone.spec | 6 ++---- tzdata2010e.tar.gz | 3 --- tzdata2010h.tar.gz | 3 +++ 6 files changed, 47 insertions(+), 11 deletions(-) delete mode 100644 tzdata2010e.tar.gz create mode 100644 tzdata2010h.tar.gz diff --git a/timezone-java.changes b/timezone-java.changes index 31fa2fc..c0992eb 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,7 +1,26 @@ +------------------------------------------------------------------- +Tue Apr 6 15:55:48 CEST 2010 - pbaudis@suse.cz + +- update tzdata to 2010h: + + * DST changes: Asia/Dhaka (again...), Asia/Karachi, Asia/Gaza, + Asia/Damascus, Pacific/Apia, Africa/Tunis + * GMT offset changes: Europe/Samara, Asia/Kamchatka, Asia/Anadyr + * Various Antarctica timezone changes + +------------------------------------------------------------------- +Thu Mar 18 17:07:37 CET 2010 - pbaudis@suse.cz + +- cleanup; changes since 2009u are: + * DST changes: Asia/Dhaka (yet again), Pacific/Fiji, Pacific/Apia, + America/Santiago, Pacific/Easter, America/Asuncion + * New zones: America/Matamoros, America/Ojinaga, America/Santa_Isabel + ------------------------------------------------------------------- Sun Mar 14 13:04:16 UTC 2010 - crrodriguez@opensuse.org -- Update to 2010u, including Chile's emergency DST changes +- Update to 2010e, including Chile's emergency DST changes +- Update code to 2010c - mostly just cleanups ------------------------------------------------------------------- Tue Jan 5 14:27:27 CET 2010 - pbaudis@suse.cz diff --git a/timezone-java.spec b/timezone-java.spec index 231dc4b..b8f2e6b 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -1,5 +1,5 @@ # -# spec file for package timezone-java (Version 2010e) +# spec file for package timezone-java (Version 2010h) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Summary: Timezone Descriptions Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2010e +Version: 2010h Release: 1 Source: tzdata%{version}.tar.gz Source1: tzcode2010c.tar.gz diff --git a/timezone.changes b/timezone.changes index 31fa2fc..c0992eb 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,7 +1,26 @@ +------------------------------------------------------------------- +Tue Apr 6 15:55:48 CEST 2010 - pbaudis@suse.cz + +- update tzdata to 2010h: + + * DST changes: Asia/Dhaka (again...), Asia/Karachi, Asia/Gaza, + Asia/Damascus, Pacific/Apia, Africa/Tunis + * GMT offset changes: Europe/Samara, Asia/Kamchatka, Asia/Anadyr + * Various Antarctica timezone changes + +------------------------------------------------------------------- +Thu Mar 18 17:07:37 CET 2010 - pbaudis@suse.cz + +- cleanup; changes since 2009u are: + * DST changes: Asia/Dhaka (yet again), Pacific/Fiji, Pacific/Apia, + America/Santiago, Pacific/Easter, America/Asuncion + * New zones: America/Matamoros, America/Ojinaga, America/Santa_Isabel + ------------------------------------------------------------------- Sun Mar 14 13:04:16 UTC 2010 - crrodriguez@opensuse.org -- Update to 2010u, including Chile's emergency DST changes +- Update to 2010e, including Chile's emergency DST changes +- Update code to 2010c - mostly just cleanups ------------------------------------------------------------------- Tue Jan 5 14:27:27 CET 2010 - pbaudis@suse.cz diff --git a/timezone.spec b/timezone.spec index 21a05c8..5b21d1f 100644 --- a/timezone.spec +++ b/timezone.spec @@ -1,5 +1,5 @@ # -# spec file for package timezone (Version 2010e) +# spec file for package timezone (Version 2010h) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2010e +Version: 2010h Release: 1 Source: tzdata%{version}.tar.gz Source1: tzcode2010c.tar.gz @@ -34,7 +34,6 @@ Patch0: tzdata-china.diff Patch1: tzcode-zic.diff Patch2: tzcode-ksh.diff Patch3: iso3166-uk.diff -#Patch4: tzdata-dhaka.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %global AREA Etc %global ZONE UTC @@ -51,7 +50,6 @@ can select an appropriate time zone for your system with YaST. %patch1 %patch2 %patch3 -#%patch4 -p1 %build unset ${!LC_*} diff --git a/tzdata2010e.tar.gz b/tzdata2010e.tar.gz deleted file mode 100644 index 1607c99..0000000 --- a/tzdata2010e.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09ebe8787560ef0a0b8b27a115d0d79d4b9e4ed9d48e768426c59ad18b73abd6 -size 187452 diff --git a/tzdata2010h.tar.gz b/tzdata2010h.tar.gz new file mode 100644 index 0000000..48ce14b --- /dev/null +++ b/tzdata2010h.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4918d60f63440ba9b6050205881e8a98d718dc0c2b7df5955f43e781eab6e7d +size 188402