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
This commit is contained in:
Dirk Mueller 2013-10-04 10:00:42 +00:00 committed by Git OBS Bridge
parent e79f0e3070
commit 33844d212b
3 changed files with 20 additions and 8 deletions

View File

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

View File

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

View File

@ -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;