Hello community, here is the log from the commit of package timezone for openSUSE:Factory checked in at 2012-08-26 11:35:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/timezone (Old) and /work/SRC/openSUSE:Factory/.timezone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "timezone", Maintainer is "dmuel...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/timezone/timezone.changes 2012-08-13 14:46:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.timezone.new/timezone.changes 2012-08-26 11:35:35.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 20 15:47:57 UTC 2012 - fcro...@suse.com + +- Add tzcode-symlink.patch: use a symlink to create /etc/localtime + (bnc#773491) +- Do not apply tzcode-link.diff on openSUSE >= 12.2 (bnc#773491). + +------------------------------------------------------------------- New: ---- tzcode-symlink.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.yj2pOH/_old 2012-08-26 11:35:36.000000000 +0200 +++ /var/tmp/diff_new_pack.yj2pOH/_new 2012-08-26 11:35:36.000000000 +0200 @@ -32,6 +32,7 @@ Patch2: tzcode-ksh.diff Patch3: iso3166-uk.diff Patch4: tzcode-link.diff +Patch5: tzcode-symlink.patch # COMMON-END BuildRoot: %{_tmppath}/%{name}-%{version}-build %global AREA Etc @@ -50,7 +51,11 @@ %patch1 %patch2 %patch3 +%if 0%{?suse_version} < 1220 %patch4 +%else +%patch5 -p1 +%endif # COMMON-PREP-END %build ++++++ tzcode-symlink.patch ++++++ Index: timezone-2012e/zic.c =================================================================== --- timezone-2012e.orig/zic.c +++ timezone-2012e/zic.c @@ -113,7 +113,7 @@ static void associate(void); static int ciequal(const char * ap, const char * bp); static void convert(long val, char * buf); static void convert64(zic_t val, char * buf); -static void dolink(const char * fromfield, const char * tofield); +static void dolink(const char * fromfield, const char * tofield, int defaultsymlink); static void doabbr(char * abbr, const char * format, const char * letters, int isdst, int doquotes); static void eat(const char * name, int num); @@ -595,7 +595,7 @@ _("%s: More than one -L option specified */ for (i = 0; i < nlinks; ++i) { eat(links[i].l_filename, links[i].l_linenum); - dolink(links[i].l_from, links[i].l_to); + dolink(links[i].l_from, links[i].l_to, FALSE); if (noise) for (j = 0; j < nlinks; ++j) if (strcmp(links[i].l_to, @@ -604,19 +604,20 @@ _("%s: More than one -L option specified } if (lcltime != NULL) { eat("command line", 1); - dolink(lcltime, TZDEFAULT); + dolink(lcltime, TZDEFAULT,TRUE); } if (psxrules != NULL) { eat("command line", 1); - dolink(psxrules, TZDEFRULES); + dolink(psxrules, TZDEFRULES,FALSE); } return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } static void -dolink(fromfield, tofield) +dolink(fromfield, tofield, defaultsymlink) const char * const fromfield; const char * const tofield; +const int defaultsymlink; { register char * fromname; register char * toname; @@ -641,15 +642,16 @@ const char * const tofield; */ if (!itsdir(toname)) (void) remove(toname); - if (link(fromname, toname) != 0) { + if (defaultsymlink || link(fromname, toname) != 0) { int result; if (mkdirs(toname) != 0) exit(EXIT_FAILURE); - result = link(fromname, toname); + if (!defaultsymlink) + result = link(fromname, toname); #if HAVE_SYMLINK - if (result != 0 && + if ((defaultsymlink || (!defaultsymlink && result != 0)) && access(fromname, F_OK) == 0 && !itsdir(fromname)) { const char *s = tofield; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org