From 33844d212b1dfe8f6f7d85fe1a6bdc222412fa1328764a47e1af7feb0c957fcb Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 4 Oct 2013 10:00:42 +0000 Subject: [PATCH] Accepting request 201982 from home:leonardocf:branches:Base:System - tzcode-link.diff: refresh patch to apply correctly on older versions of the distribution. OBS-URL: https://build.opensuse.org/request/show/201982 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=120 --- timezone-java.changes | 6 ++++++ timezone.changes | 6 ++++++ tzcode-link.diff | 16 ++++++++-------- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/timezone-java.changes b/timezone-java.changes index e8e001c..261ef9a 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 2 23:35:00 UTC 2013 - lchiquitto@suse.com + +- tzcode-link.diff: refresh patch to apply correctly on older + versions of the distribution. + ------------------------------------------------------------------- Tue Oct 1 22:27:14 UTC 2013 - crrodriguez@opensuse.org diff --git a/timezone.changes b/timezone.changes index e8e001c..261ef9a 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 2 23:35:00 UTC 2013 - lchiquitto@suse.com + +- tzcode-link.diff: refresh patch to apply correctly on older + versions of the distribution. + ------------------------------------------------------------------- Tue Oct 1 22:27:14 UTC 2013 - crrodriguez@opensuse.org diff --git a/tzcode-link.diff b/tzcode-link.diff index d51494e..d15314b 100644 --- a/tzcode-link.diff +++ b/tzcode-link.diff @@ -1,8 +1,8 @@ -Index: zic.c +Index: timezone-2013g/zic.c =================================================================== ---- zic.c.orig -+++ zic.c -@@ -576,6 +576,23 @@ _("%s: More than one -L option specified +--- timezone-2013g.orig/zic.c ++++ timezone-2013g/zic.c +@@ -593,6 +593,23 @@ _("%s: More than one -L option specified return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } @@ -26,12 +26,12 @@ Index: zic.c static void dolink(const char *const fromfield, const char *const tofield) { -@@ -609,6 +626,8 @@ dolink(const char *const fromfield, cons +@@ -627,6 +644,8 @@ dolink(const char *const fromfield, cons 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 && + if (result != 0) { + const char *s = fromfield; + const char *t;