From 345c6e24b51cca4c2e435fd6248a38edda02986358cd064189fd477b5bcd6754 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 23 Oct 2013 07:37:26 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=123 --- timezone-java.changes | 14 ++++++++++++++ timezone-java.spec | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/timezone-java.changes b/timezone-java.changes index 261ef9a..c1caf63 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Oct 23 07:36:26 UTC 2013 - werner@suse.de + +- Re-run pre_checkin.sh to prepare timezone-jave.spec + +------------------------------------------------------------------- +Mon Oct 14 13:56:20 UTC 2013 - werner@suse.de + +- Add patch tzcode-fromname.patch to correct path expansion for + local time link (bnc#845530) +- Modify tzcode-link.diff to fit with tzcode-fromname.patch +- Modify tzcode-symlink.patch to fit with tzcode-fromname.patch + and to avoid broken posixrules if /etc/localtime is a symlink + ------------------------------------------------------------------- Wed Oct 2 23:35:00 UTC 2013 - lchiquitto@suse.com diff --git a/timezone-java.spec b/timezone-java.spec index 0e3e874..bacf495 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -31,6 +31,8 @@ Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz Patch0: tzdata-china.diff Patch1: tzcode-zic.diff +# PATCH-FIX-OPENSUSE bnc#845530 +Patch2: tzcode-fromname.patch Patch3: iso3166-uk.diff Patch4: tzcode-link.diff Patch5: tzcode-symlink.patch @@ -54,12 +56,14 @@ package is intended for Java Virtual Machine based on OpenJDK. # COMMON-PREP-BEGIN %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch3 -p1 %if 0%{?suse_version} < 1220 %patch4 -p1 %else %patch5 -p1 %endif +sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358] # COMMON-PREP-END # COMMON-PREP-END