From ee069f850c9e189595fe8e90ca1f5245c828afd9a8cafb7bcd7cb523ebc4e327 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Wed, 18 Aug 2010 23:34:54 +0000 Subject: [PATCH 1/6] - update tzdata to 2010l * DST changes: Africa/Cairo, Africa/Casablanca, Asia/Gaza, America/Argentina/San_Luis * New zones: America/Bahia_Banderas * Historical changes: Asia/Taipei, Europe/Helsinki * Spelling changes: Pacific/Chuuk, Pacific/Pohnpei OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=26 --- timezone-java.changes | 11 ++++++++ timezone-java.spec | 65 ------------------------------------------- timezone.changes | 11 ++++++++ timezone.spec | 4 +-- tzdata-china.diff | 4 ++- tzdata2010h.tar.gz | 3 -- tzdata2010l.tar.gz | 3 ++ 7 files changed, 30 insertions(+), 71 deletions(-) delete mode 100644 timezone-java.spec delete mode 100644 tzdata2010h.tar.gz create mode 100644 tzdata2010l.tar.gz diff --git a/timezone-java.changes b/timezone-java.changes index 83825f0..584f714 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Aug 19 01:18:14 CEST 2010 - pbaudis@suse.cz + +- update tzdata to 2010l + + * DST changes: Africa/Cairo, Africa/Casablanca, Asia/Gaza, + America/Argentina/San_Luis + * New zones: America/Bahia_Banderas + * Historical changes: Asia/Taipei, Europe/Helsinki + * Spelling changes: Pacific/Chuuk, Pacific/Pohnpei + ------------------------------------------------------------------- Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de diff --git a/timezone-java.spec b/timezone-java.spec deleted file mode 100644 index 71dce53..0000000 --- a/timezone-java.spec +++ /dev/null @@ -1,65 +0,0 @@ -# -# spec file for package timezone-java (Version 2010h) -# -# 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: 2010h -Release: 4 -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 83825f0..584f714 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Aug 19 01:18:14 CEST 2010 - pbaudis@suse.cz + +- update tzdata to 2010l + + * DST changes: Africa/Cairo, Africa/Casablanca, Asia/Gaza, + America/Argentina/San_Luis + * New zones: America/Bahia_Banderas + * Historical changes: Asia/Taipei, Europe/Helsinki + * Spelling changes: Pacific/Chuuk, Pacific/Pohnpei + ------------------------------------------------------------------- Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de diff --git a/timezone.spec b/timezone.spec index d79d8b5..fcf8c4a 100644 --- a/timezone.spec +++ b/timezone.spec @@ -25,8 +25,8 @@ Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2010h -Release: 4 +Version: 2010l +Release: 1 Source: tzdata%{version}.tar.gz Source1: tzcode2010c.tar.gz # COMMON-END diff --git a/tzdata-china.diff b/tzdata-china.diff index fdd8706..ea837ca 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -23,7 +23,9 @@ Index: backward -Link Asia/Shanghai PRC +Link Asia/Beijing PRC Link Pacific/Pago_Pago Pacific/Samoa - Link Pacific/Truk Pacific/Yap + Link Pacific/Chuuk Pacific/Yap + Link Pacific/Chuuk Pacific/Truk + Link Pacific/Pohnpei Pacific/Ponape Link Europe/Warsaw Poland Link Europe/Lisbon Portugal -Link Asia/Taipei ROC 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 diff --git a/tzdata2010l.tar.gz b/tzdata2010l.tar.gz new file mode 100644 index 0000000..cbcab2a --- /dev/null +++ b/tzdata2010l.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bae7b4a8364f7ab3d6d644eb6075de1e9a0c72fb3fb5843fc217d2ff57408577 +size 191467 From 6616e71e99d81db25eb0609869b152c50baa760a2e78aed1f3113a99f8c592a0 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Tue, 24 Aug 2010 10:38:30 +0000 Subject: [PATCH 2/6] - Make zic -l do a copy when hardlinking fails (e.g. because /usr being on a separate partition) [bnc#607532] - un-fuzz patches to fix build OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=27 --- timezone-java.changes | 11 +++++++++++ timezone.changes | 11 +++++++++++ timezone.spec | 6 ++++-- tzcode-ksh.diff | 8 +++++--- tzcode-link.diff | 35 +++++++++++++++++++++++++++++++++++ tzcode-zic.diff | 8 +++++--- tzdata-china.diff | 6 +++--- 7 files changed, 74 insertions(+), 11 deletions(-) create mode 100644 tzcode-link.diff diff --git a/timezone-java.changes b/timezone-java.changes index 584f714..7e7fef8 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Aug 24 12:11:51 CEST 2010 - pbaudis@suse.cz + +- Make zic -l do a copy when hardlinking fails (e.g. because /usr + being on a separate partition) [bnc#607532] + +------------------------------------------------------------------- +Thu Aug 19 18:12:03 CEST 2010 - ro@suse.de + +- un-fuzz patches to fix build + ------------------------------------------------------------------- Thu Aug 19 01:18:14 CEST 2010 - pbaudis@suse.cz diff --git a/timezone.changes b/timezone.changes index 584f714..7e7fef8 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Aug 24 12:11:51 CEST 2010 - pbaudis@suse.cz + +- Make zic -l do a copy when hardlinking fails (e.g. because /usr + being on a separate partition) [bnc#607532] + +------------------------------------------------------------------- +Thu Aug 19 18:12:03 CEST 2010 - ro@suse.de + +- un-fuzz patches to fix build + ------------------------------------------------------------------- Thu Aug 19 01:18:14 CEST 2010 - pbaudis@suse.cz diff --git a/timezone.spec b/timezone.spec index fcf8c4a..28c9a64 100644 --- a/timezone.spec +++ b/timezone.spec @@ -1,5 +1,5 @@ # -# spec file for package timezone (Version 2010h) +# spec file for package timezone (Version 2010l) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN Version: 2010l -Release: 1 +Release: 0. Source: tzdata%{version}.tar.gz Source1: tzcode2010c.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: tzcode-link.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 %build unset ${!LC_*} diff --git a/tzcode-ksh.diff b/tzcode-ksh.diff index 23db479..1d01b19 100644 --- a/tzcode-ksh.diff +++ b/tzcode-ksh.diff @@ -1,6 +1,8 @@ ---- Makefile~ 2007-08-03 15:06:38.257922000 +0200 -+++ Makefile 2007-08-03 15:07:10.983167000 +0200 -@@ -362,6 +362,7 @@ +Index: Makefile +=================================================================== +--- Makefile.orig ++++ Makefile +@@ -357,6 +357,7 @@ date: $(DATEOBJS) tzselect: tzselect.ksh sed \ diff --git a/tzcode-link.diff b/tzcode-link.diff new file mode 100644 index 0000000..9e46e13 --- /dev/null +++ b/tzcode-link.diff @@ -0,0 +1,35 @@ +--- zic.c 2010-01-06 16:21:33.000000000 +0100 ++++ zic.c 2010-06-01 01:34:12.000000000 +0200 +@@ -614,6 +614,23 @@ + return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; + } + ++static int ++copy(fromname, toname) ++const char * const fromname; ++const char * const toname; ++{ ++ if (!fork()) { ++ execlp("cp", "cp", fromname, toname); ++ _exit(1); ++ } ++ int s; ++ if (wait(&s) < 0) ++ return -1; ++ if (!WIFEXITED(s)) ++ return -1; ++ return -WEXITSTATUS(s); ++} ++ + static void + dolink(fromfield, tofield) + const char * const fromfield; +@@ -649,6 +666,8 @@ + exit(EXIT_FAILURE); + + result = link(fromname, toname); ++ if (result != 0) ++ result = copy(fromname, toname); + #if HAVE_SYMLINK + if (result != 0 && + access(fromname, F_OK) == 0 && diff --git a/tzcode-zic.diff b/tzcode-zic.diff index 7b2c48d..15cd86e 100644 --- a/tzcode-zic.diff +++ b/tzcode-zic.diff @@ -1,6 +1,8 @@ ---- zic.c -+++ zic.c 2006/01/11 17:41:30 -@@ -653,8 +653,10 @@ +Index: zic.c +=================================================================== +--- zic.c.orig ++++ zic.c +@@ -665,8 +665,10 @@ const char * const tofield; fromname); result = symlink(symlinkcontents, toname); diff --git a/tzdata-china.diff b/tzdata-china.diff index ea837ca..c4ca7cb 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -2,7 +2,7 @@ Index: asia =================================================================== --- asia.orig +++ asia -@@ -533,6 +533,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o +@@ -531,6 +531,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. @@ -16,7 +16,7 @@ Index: backward =================================================================== --- backward.orig +++ backward -@@ -88,12 +88,11 @@ Link America/Mexico_City Mexico/General +@@ -88,14 +88,13 @@ Link America/Mexico_City Mexico/General Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo @@ -36,7 +36,7 @@ Index: zone.tab =================================================================== --- zone.tab.orig +++ zone.tab -@@ -145,11 +145,12 @@ CK -2114-15946 Pacific/Rarotonga +@@ -146,11 +146,12 @@ CK -2114-15946 Pacific/Rarotonga CL -3327-07040 America/Santiago most locations CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez CM +0403+00942 Africa/Douala From b5c3f7a308f9f1eae3d4b84304405e01a52ba85e520028ac474191b4d5adfc68 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Wed, 25 Aug 2010 10:04:16 +0000 Subject: [PATCH 3/6] Accepting request 46178 from home:oertel:branches:openSUSE:Factory Copy from home:oertel:branches:openSUSE:Factory/timezone via accept of submit request 46178 revision 2. Request was accepted with message: reviewed ok. thanks\! OBS-URL: https://build.opensuse.org/request/show/46178 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=28 --- timezone-java.changes | 5 +++++ timezone.changes | 5 +++++ tzcode-link.diff | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/timezone-java.changes b/timezone-java.changes index 7e7fef8..fdba377 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 25 11:59:01 CEST 2010 - ro@suse.de + +- add missing sentinel to tzcode-link.diff + ------------------------------------------------------------------- Tue Aug 24 12:11:51 CEST 2010 - pbaudis@suse.cz diff --git a/timezone.changes b/timezone.changes index 7e7fef8..fdba377 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 25 11:59:01 CEST 2010 - ro@suse.de + +- add missing sentinel to tzcode-link.diff + ------------------------------------------------------------------- Tue Aug 24 12:11:51 CEST 2010 - pbaudis@suse.cz diff --git a/tzcode-link.diff b/tzcode-link.diff index 9e46e13..d83bab7 100644 --- a/tzcode-link.diff +++ b/tzcode-link.diff @@ -10,7 +10,7 @@ +const char * const toname; +{ + if (!fork()) { -+ execlp("cp", "cp", fromname, toname); ++ execlp("cp", "cp", fromname, toname, (char*) NULL); + _exit(1); + } + int s; From 32f2697feb345e877d5492a028bd985efe86eca542cebd38ce70b51026a8ff5f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 21 Sep 2010 14:18:59 +0000 Subject: [PATCH 4/6] - change execlp into execl OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=29 --- timezone-java.changes | 5 ++++ timezone-java.spec | 68 +++++++++++++++++++++++++++++++++++++++++++ timezone.changes | 5 ++++ tzcode-link.diff | 2 +- 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 timezone-java.spec diff --git a/timezone-java.changes b/timezone-java.changes index fdba377..53f4648 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 21 16:18:24 CEST 2010 - dmueller@suse.de + +- change execlp into execl + ------------------------------------------------------------------- Wed Aug 25 11:59:01 CEST 2010 - ro@suse.de diff --git a/timezone-java.spec b/timezone-java.spec new file mode 100644 index 0000000..a3934a1 --- /dev/null +++ b/timezone-java.spec @@ -0,0 +1,68 @@ +# +# spec file for package timezone-java (Version 2008h) +# +# 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 +# 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: 2010l +Release: 0. +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 +* 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 fdba377..53f4648 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 21 16:18:24 CEST 2010 - dmueller@suse.de + +- change execlp into execl + ------------------------------------------------------------------- Wed Aug 25 11:59:01 CEST 2010 - ro@suse.de diff --git a/tzcode-link.diff b/tzcode-link.diff index d83bab7..806175c 100644 --- a/tzcode-link.diff +++ b/tzcode-link.diff @@ -10,7 +10,7 @@ +const char * const toname; +{ + if (!fork()) { -+ execlp("cp", "cp", fromname, toname, (char*) NULL); ++ execl("/bin/cp", "cp", fromname, toname, (char*) NULL); + _exit(1); + } + int s; From c966c778150ea0065fa45f47a27b725a760fdee5a5a30d94fc39f4244426b722 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 21 Sep 2010 16:21:54 +0000 Subject: [PATCH 5/6] Accepting request 48685 from Base:System checked in (request 48685) OBS-URL: https://build.opensuse.org/request/show/48685 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=30 --- timezone-java.changes | 32 -------------------------------- timezone-java.spec | 11 ++++------- timezone.changes | 32 -------------------------------- timezone.spec | 8 +++----- tzcode-ksh.diff | 8 +++----- tzcode-link.diff | 35 ----------------------------------- tzcode-zic.diff | 8 +++----- tzdata-china.diff | 10 ++++------ tzdata2010h.tar.gz | 3 +++ tzdata2010l.tar.gz | 3 --- 10 files changed, 20 insertions(+), 130 deletions(-) delete mode 100644 tzcode-link.diff create mode 100644 tzdata2010h.tar.gz delete mode 100644 tzdata2010l.tar.gz diff --git a/timezone-java.changes b/timezone-java.changes index 53f4648..83825f0 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,35 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 21 16:18:24 CEST 2010 - dmueller@suse.de - -- change execlp into execl - -------------------------------------------------------------------- -Wed Aug 25 11:59:01 CEST 2010 - ro@suse.de - -- add missing sentinel to tzcode-link.diff - -------------------------------------------------------------------- -Tue Aug 24 12:11:51 CEST 2010 - pbaudis@suse.cz - -- Make zic -l do a copy when hardlinking fails (e.g. because /usr - being on a separate partition) [bnc#607532] - -------------------------------------------------------------------- -Thu Aug 19 18:12:03 CEST 2010 - ro@suse.de - -- un-fuzz patches to fix build - -------------------------------------------------------------------- -Thu Aug 19 01:18:14 CEST 2010 - pbaudis@suse.cz - -- update tzdata to 2010l - - * DST changes: Africa/Cairo, Africa/Casablanca, Asia/Gaza, - America/Argentina/San_Luis - * New zones: America/Bahia_Banderas - * Historical changes: Asia/Taipei, Europe/Helsinki - * Spelling changes: Pacific/Chuuk, Pacific/Pohnpei - ------------------------------------------------------------------- Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de diff --git a/timezone-java.spec b/timezone-java.spec index a3934a1..71dce53 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 2010h) # -# 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,8 +25,8 @@ Summary: Timezone Descriptions Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2010l -Release: 0. +Version: 2010h +Release: 4 Source: tzdata%{version}.tar.gz Source1: tzcode2010c.tar.gz # COMMON-END @@ -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 53f4648..83825f0 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,35 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 21 16:18:24 CEST 2010 - dmueller@suse.de - -- change execlp into execl - -------------------------------------------------------------------- -Wed Aug 25 11:59:01 CEST 2010 - ro@suse.de - -- add missing sentinel to tzcode-link.diff - -------------------------------------------------------------------- -Tue Aug 24 12:11:51 CEST 2010 - pbaudis@suse.cz - -- Make zic -l do a copy when hardlinking fails (e.g. because /usr - being on a separate partition) [bnc#607532] - -------------------------------------------------------------------- -Thu Aug 19 18:12:03 CEST 2010 - ro@suse.de - -- un-fuzz patches to fix build - -------------------------------------------------------------------- -Thu Aug 19 01:18:14 CEST 2010 - pbaudis@suse.cz - -- update tzdata to 2010l - - * DST changes: Africa/Cairo, Africa/Casablanca, Asia/Gaza, - America/Argentina/San_Luis - * New zones: America/Bahia_Banderas - * Historical changes: Asia/Taipei, Europe/Helsinki - * Spelling changes: Pacific/Chuuk, Pacific/Pohnpei - ------------------------------------------------------------------- Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de diff --git a/timezone.spec b/timezone.spec index 28c9a64..d79d8b5 100644 --- a/timezone.spec +++ b/timezone.spec @@ -1,5 +1,5 @@ # -# spec file for package timezone (Version 2010l) +# spec file for package timezone (Version 2010h) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2010l -Release: 0. +Version: 2010h +Release: 4 Source: tzdata%{version}.tar.gz Source1: tzcode2010c.tar.gz # COMMON-END @@ -34,7 +34,6 @@ Patch0: tzdata-china.diff Patch1: tzcode-zic.diff Patch2: tzcode-ksh.diff Patch3: iso3166-uk.diff -Patch4: tzcode-link.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 %build unset ${!LC_*} diff --git a/tzcode-ksh.diff b/tzcode-ksh.diff index 1d01b19..23db479 100644 --- a/tzcode-ksh.diff +++ b/tzcode-ksh.diff @@ -1,8 +1,6 @@ -Index: Makefile -=================================================================== ---- Makefile.orig -+++ Makefile -@@ -357,6 +357,7 @@ date: $(DATEOBJS) +--- Makefile~ 2007-08-03 15:06:38.257922000 +0200 ++++ Makefile 2007-08-03 15:07:10.983167000 +0200 +@@ -362,6 +362,7 @@ tzselect: tzselect.ksh sed \ diff --git a/tzcode-link.diff b/tzcode-link.diff deleted file mode 100644 index 806175c..0000000 --- a/tzcode-link.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- zic.c 2010-01-06 16:21:33.000000000 +0100 -+++ zic.c 2010-06-01 01:34:12.000000000 +0200 -@@ -614,6 +614,23 @@ - return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; - } - -+static int -+copy(fromname, toname) -+const char * const fromname; -+const char * const toname; -+{ -+ if (!fork()) { -+ execl("/bin/cp", "cp", fromname, toname, (char*) NULL); -+ _exit(1); -+ } -+ int s; -+ if (wait(&s) < 0) -+ return -1; -+ if (!WIFEXITED(s)) -+ return -1; -+ return -WEXITSTATUS(s); -+} -+ - static void - dolink(fromfield, tofield) - const char * const fromfield; -@@ -649,6 +666,8 @@ - exit(EXIT_FAILURE); - - result = link(fromname, toname); -+ if (result != 0) -+ result = copy(fromname, toname); - #if HAVE_SYMLINK - if (result != 0 && - access(fromname, F_OK) == 0 && diff --git a/tzcode-zic.diff b/tzcode-zic.diff index 15cd86e..7b2c48d 100644 --- a/tzcode-zic.diff +++ b/tzcode-zic.diff @@ -1,8 +1,6 @@ -Index: zic.c -=================================================================== ---- zic.c.orig -+++ zic.c -@@ -665,8 +665,10 @@ const char * const tofield; +--- zic.c ++++ zic.c 2006/01/11 17:41:30 +@@ -653,8 +653,10 @@ fromname); result = symlink(symlinkcontents, toname); diff --git a/tzdata-china.diff b/tzdata-china.diff index c4ca7cb..fdd8706 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -2,7 +2,7 @@ Index: asia =================================================================== --- asia.orig +++ asia -@@ -531,6 +531,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o +@@ -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. @@ -16,16 +16,14 @@ Index: backward =================================================================== --- backward.orig +++ backward -@@ -88,14 +88,13 @@ Link America/Mexico_City Mexico/General +@@ -88,12 +88,11 @@ Link America/Mexico_City Mexico/General Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo -Link Asia/Shanghai PRC +Link Asia/Beijing PRC Link Pacific/Pago_Pago Pacific/Samoa - Link Pacific/Chuuk Pacific/Yap - Link Pacific/Chuuk Pacific/Truk - Link Pacific/Pohnpei Pacific/Ponape + Link Pacific/Truk Pacific/Yap Link Europe/Warsaw Poland Link Europe/Lisbon Portugal -Link Asia/Taipei ROC @@ -36,7 +34,7 @@ Index: zone.tab =================================================================== --- zone.tab.orig +++ zone.tab -@@ -146,11 +146,12 @@ CK -2114-15946 Pacific/Rarotonga +@@ -145,11 +145,12 @@ CK -2114-15946 Pacific/Rarotonga CL -3327-07040 America/Santiago most locations CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez CM +0403+00942 Africa/Douala 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 diff --git a/tzdata2010l.tar.gz b/tzdata2010l.tar.gz deleted file mode 100644 index cbcab2a..0000000 --- a/tzdata2010l.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bae7b4a8364f7ab3d6d644eb6075de1e9a0c72fb3fb5843fc217d2ff57408577 -size 191467 From 85f965a3225ec30261316ebbe9bab6d5961083d36d24f19f52e6fbca99fc3f11 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 21 Sep 2010 16:21:55 +0000 Subject: [PATCH 6/6] Updating link to change in openSUSE:Factory/timezone revision 33.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=bef4e824ed7935d06bc6cddfe3f2894e --- timezone-java.changes | 32 ++++++++++++++++++++++++++++++++ timezone-java.spec | 6 +++--- timezone.changes | 32 ++++++++++++++++++++++++++++++++ timezone.spec | 8 +++++--- tzcode-ksh.diff | 8 +++++--- tzcode-link.diff | 35 +++++++++++++++++++++++++++++++++++ tzcode-zic.diff | 8 +++++--- tzdata-china.diff | 10 ++++++---- tzdata2010h.tar.gz | 3 --- tzdata2010l.tar.gz | 3 +++ 10 files changed, 126 insertions(+), 19 deletions(-) create mode 100644 tzcode-link.diff delete mode 100644 tzdata2010h.tar.gz create mode 100644 tzdata2010l.tar.gz diff --git a/timezone-java.changes b/timezone-java.changes index 83825f0..53f4648 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Tue Sep 21 16:18:24 CEST 2010 - dmueller@suse.de + +- change execlp into execl + +------------------------------------------------------------------- +Wed Aug 25 11:59:01 CEST 2010 - ro@suse.de + +- add missing sentinel to tzcode-link.diff + +------------------------------------------------------------------- +Tue Aug 24 12:11:51 CEST 2010 - pbaudis@suse.cz + +- Make zic -l do a copy when hardlinking fails (e.g. because /usr + being on a separate partition) [bnc#607532] + +------------------------------------------------------------------- +Thu Aug 19 18:12:03 CEST 2010 - ro@suse.de + +- un-fuzz patches to fix build + +------------------------------------------------------------------- +Thu Aug 19 01:18:14 CEST 2010 - pbaudis@suse.cz + +- update tzdata to 2010l + + * DST changes: Africa/Cairo, Africa/Casablanca, Asia/Gaza, + America/Argentina/San_Luis + * New zones: America/Bahia_Banderas + * Historical changes: Asia/Taipei, Europe/Helsinki + * Spelling changes: Pacific/Chuuk, Pacific/Pohnpei + ------------------------------------------------------------------- Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de diff --git a/timezone-java.spec b/timezone-java.spec index 71dce53..3b4702e 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -1,5 +1,5 @@ # -# spec file for package timezone-java (Version 2010h) +# spec file for package timezone-java (Version 2010l) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ Summary: Timezone Descriptions Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2010h -Release: 4 +Version: 2010l +Release: 1 Source: tzdata%{version}.tar.gz Source1: tzcode2010c.tar.gz # COMMON-END diff --git a/timezone.changes b/timezone.changes index 83825f0..53f4648 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Tue Sep 21 16:18:24 CEST 2010 - dmueller@suse.de + +- change execlp into execl + +------------------------------------------------------------------- +Wed Aug 25 11:59:01 CEST 2010 - ro@suse.de + +- add missing sentinel to tzcode-link.diff + +------------------------------------------------------------------- +Tue Aug 24 12:11:51 CEST 2010 - pbaudis@suse.cz + +- Make zic -l do a copy when hardlinking fails (e.g. because /usr + being on a separate partition) [bnc#607532] + +------------------------------------------------------------------- +Thu Aug 19 18:12:03 CEST 2010 - ro@suse.de + +- un-fuzz patches to fix build + +------------------------------------------------------------------- +Thu Aug 19 01:18:14 CEST 2010 - pbaudis@suse.cz + +- update tzdata to 2010l + + * DST changes: Africa/Cairo, Africa/Casablanca, Asia/Gaza, + America/Argentina/San_Luis + * New zones: America/Bahia_Banderas + * Historical changes: Asia/Taipei, Europe/Helsinki + * Spelling changes: Pacific/Chuuk, Pacific/Pohnpei + ------------------------------------------------------------------- Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de diff --git a/timezone.spec b/timezone.spec index d79d8b5..87a4b95 100644 --- a/timezone.spec +++ b/timezone.spec @@ -1,5 +1,5 @@ # -# spec file for package timezone (Version 2010h) +# spec file for package timezone (Version 2010l) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2010h -Release: 4 +Version: 2010l +Release: 1 Source: tzdata%{version}.tar.gz Source1: tzcode2010c.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: tzcode-link.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 %build unset ${!LC_*} diff --git a/tzcode-ksh.diff b/tzcode-ksh.diff index 23db479..1d01b19 100644 --- a/tzcode-ksh.diff +++ b/tzcode-ksh.diff @@ -1,6 +1,8 @@ ---- Makefile~ 2007-08-03 15:06:38.257922000 +0200 -+++ Makefile 2007-08-03 15:07:10.983167000 +0200 -@@ -362,6 +362,7 @@ +Index: Makefile +=================================================================== +--- Makefile.orig ++++ Makefile +@@ -357,6 +357,7 @@ date: $(DATEOBJS) tzselect: tzselect.ksh sed \ diff --git a/tzcode-link.diff b/tzcode-link.diff new file mode 100644 index 0000000..806175c --- /dev/null +++ b/tzcode-link.diff @@ -0,0 +1,35 @@ +--- zic.c 2010-01-06 16:21:33.000000000 +0100 ++++ zic.c 2010-06-01 01:34:12.000000000 +0200 +@@ -614,6 +614,23 @@ + return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; + } + ++static int ++copy(fromname, toname) ++const char * const fromname; ++const char * const toname; ++{ ++ if (!fork()) { ++ execl("/bin/cp", "cp", fromname, toname, (char*) NULL); ++ _exit(1); ++ } ++ int s; ++ if (wait(&s) < 0) ++ return -1; ++ if (!WIFEXITED(s)) ++ return -1; ++ return -WEXITSTATUS(s); ++} ++ + static void + dolink(fromfield, tofield) + const char * const fromfield; +@@ -649,6 +666,8 @@ + exit(EXIT_FAILURE); + + result = link(fromname, toname); ++ if (result != 0) ++ result = copy(fromname, toname); + #if HAVE_SYMLINK + if (result != 0 && + access(fromname, F_OK) == 0 && diff --git a/tzcode-zic.diff b/tzcode-zic.diff index 7b2c48d..15cd86e 100644 --- a/tzcode-zic.diff +++ b/tzcode-zic.diff @@ -1,6 +1,8 @@ ---- zic.c -+++ zic.c 2006/01/11 17:41:30 -@@ -653,8 +653,10 @@ +Index: zic.c +=================================================================== +--- zic.c.orig ++++ zic.c +@@ -665,8 +665,10 @@ const char * const tofield; fromname); result = symlink(symlinkcontents, toname); diff --git a/tzdata-china.diff b/tzdata-china.diff index fdd8706..c4ca7cb 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -2,7 +2,7 @@ Index: asia =================================================================== --- asia.orig +++ asia -@@ -533,6 +533,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o +@@ -531,6 +531,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. @@ -16,14 +16,16 @@ Index: backward =================================================================== --- backward.orig +++ backward -@@ -88,12 +88,11 @@ Link America/Mexico_City Mexico/General +@@ -88,14 +88,13 @@ Link America/Mexico_City Mexico/General Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo -Link Asia/Shanghai PRC +Link Asia/Beijing PRC Link Pacific/Pago_Pago Pacific/Samoa - Link Pacific/Truk Pacific/Yap + Link Pacific/Chuuk Pacific/Yap + Link Pacific/Chuuk Pacific/Truk + Link Pacific/Pohnpei Pacific/Ponape Link Europe/Warsaw Poland Link Europe/Lisbon Portugal -Link Asia/Taipei ROC @@ -34,7 +36,7 @@ Index: zone.tab =================================================================== --- zone.tab.orig +++ zone.tab -@@ -145,11 +145,12 @@ CK -2114-15946 Pacific/Rarotonga +@@ -146,11 +146,12 @@ CK -2114-15946 Pacific/Rarotonga CL -3327-07040 America/Santiago most locations CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez CM +0403+00942 Africa/Douala 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 diff --git a/tzdata2010l.tar.gz b/tzdata2010l.tar.gz new file mode 100644 index 0000000..cbcab2a --- /dev/null +++ b/tzdata2010l.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bae7b4a8364f7ab3d6d644eb6075de1e9a0c72fb3fb5843fc217d2ff57408577 +size 191467