From 0ccdb8079cba510d97430106d94b57762ee2835d892a8d11a8c21ca05a461f3a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 10 Feb 2014 21:11:02 +0000 Subject: [PATCH] - install /etc/localtime as symlink to UTC by default OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=127 --- timezone-java.spec | 2 +- timezone.changes | 5 +++++ timezone.spec | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/timezone-java.spec b/timezone-java.spec index 18170f8..b0110f1 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -1,7 +1,7 @@ # # spec file for package timezone-java # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/timezone.changes b/timezone.changes index 1e90569..e8574ad 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 10 21:10:49 UTC 2014 - dmueller@suse.com + +- install /etc/localtime as symlink to UTC by default + ------------------------------------------------------------------- Mon Oct 28 09:32:47 UTC 2013 - dmueller@suse.com diff --git a/timezone.spec b/timezone.spec index 8948db2..0cd2c93 100644 --- a/timezone.spec +++ b/timezone.spec @@ -1,7 +1,7 @@ # # spec file for package timezone # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -80,7 +80,11 @@ cp -a zoneinfo-leaps %{buildroot}%{_prefix}/share/zoneinfo/right mkdir -p %{buildroot}/etc rm -f %{buildroot}/etc/localtime rm -f %{buildroot}%{_prefix}/share/zoneinfo/posixrules +%if 0%{?suse_version} >= 1230 +ln -sf %{_prefix}/share/zoneinfo/%{AREA}/%{ZONE} %{buildroot}/etc/localtime +%else cp -fp %{buildroot}%{_prefix}/share/zoneinfo/%{AREA}/%{ZONE} %{buildroot}/etc/localtime +%endif ln -sf /etc/localtime %{buildroot}%{_prefix}/share/zoneinfo/posixrules install -m 644 iso3166.tab %{buildroot}%{_prefix}/share/zoneinfo/iso3166.tab install -m 644 zone.tab %{buildroot}%{_prefix}/share/zoneinfo/zone.tab