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] 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