diff --git a/timezone-java.changes b/timezone-java.changes index f17e1c8..e03687d 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +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 index 3f33f38..e3a1248 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -1,7 +1,7 @@ # -# spec file for package timezone-java (Version 2009p) +# spec file for package timezone-java (Version 2009u) # -# 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,8 +25,8 @@ Summary: Timezone Descriptions Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2009p -Release: 2 +Version: 2009u +Release: 1 Source: tzdata%{version}.tar.gz Source1: tzcode2009k.tar.gz # COMMON-END diff --git a/timezone.changes b/timezone.changes index f17e1c8..e03687d 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +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.spec b/timezone.spec index 8284660..9f26a9f 100644 --- a/timezone.spec +++ b/timezone.spec @@ -1,7 +1,7 @@ # -# spec file for package timezone (Version 2009p) +# spec file for package timezone (Version 2009u) # -# 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,8 +25,8 @@ Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2009p -Release: 2 +Version: 2009u +Release: 1 Source: tzdata%{version}.tar.gz Source1: tzcode2009k.tar.gz # COMMON-END @@ -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_*} @@ -58,8 +60,8 @@ LC_ALL=POSIX AREA=%{AREA} ZONE=%{ZONE} export AREA LANG LC_ALL ZONE -make TZDIR=%{_prefix}/share/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"'" AWK=awk -make TZDIR=zoneinfo AWK=awk zones +make %{?jobs:-j%jobs} TZDIR=%{_prefix}/share/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"'" AWK=awk +make %{?jobs:-j%jobs} TZDIR=zoneinfo AWK=awk zones # Generate posixrules ./zic -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE} diff --git a/tzdata-china.diff b/tzdata-china.diff index 7d77155..fdd8706 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -2,16 +2,16 @@ Index: asia =================================================================== --- asia.orig +++ asia -@@ -351,6 +351,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o - 5:00 - KAST 1980 May - 8:00 PRC C%sT +@@ -533,6 +533,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o + # The Japanese surrender of Hong Kong was signed 1945-09-15. + # For lack of anything better, use start of those days as the transition times. +# Nowadays, China Standard Time is known as "Beijing Time" +Zone Asia/Beijing 8:00 PRC C%sT + # Hong Kong (Xianggang) # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule HK 1946 only - Apr 20 3:30 1:00 S + Rule HK 1941 only - Apr 1 3:30 1:00 S Index: backward =================================================================== --- backward.orig diff --git a/tzdata-dhaka.diff b/tzdata-dhaka.diff new file mode 100644 index 0000000..1af5f7c --- /dev/null +++ b/tzdata-dhaka.diff @@ -0,0 +1,19 @@ +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/tzdata2009p.tar.gz b/tzdata2009p.tar.gz deleted file mode 100644 index 98cb3e2..0000000 --- a/tzdata2009p.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7182ad6f03bfe16ccdbac4a3efb9e765ea7c51afc33c3a7fefb053122aa6da2c -size 182635 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