SHA256
1
0
forked from pool/timezone

Accepting request 611352 from Base:System

- in SLE 15 / Leap 15.0 yast2-country stopped setting TIMEZONE in
  /etc/sysconfig/clock and called systemd timedatectl instead.
  No longer set /etc/localtime on timezone package updates to
  avoid setting an incorrect timezone. bsc#1093392

OBS-URL: https://build.opensuse.org/request/show/611352
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/timezone?expand=0&rev=121
This commit is contained in:
Dominique Leuenberger 2018-05-25 19:34:03 +00:00 committed by Git OBS Bridge
commit 1de3994f66
3 changed files with 16 additions and 15 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 22 15:45:39 UTC 2018 - astieger@suse.com
- in SLE 15 / Leap 15.0 yast2-country stopped setting TIMEZONE in
/etc/sysconfig/clock and called systemd timedatectl instead.
No longer set /etc/localtime on timezone package updates to
avoid setting an incorrect timezone. bsc#1093392
-------------------------------------------------------------------
Fri May 4 05:57:53 UTC 2018 - astieger@suse.com

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 22 15:45:39 UTC 2018 - astieger@suse.com
- in SLE 15 / Leap 15.0 yast2-country stopped setting TIMEZONE in
/etc/sysconfig/clock and called systemd timedatectl instead.
No longer set /etc/localtime on timezone package updates to
avoid setting an incorrect timezone. bsc#1093392
-------------------------------------------------------------------
Fri May 4 05:57:53 UTC 2018 - astieger@suse.com

View File

@ -87,21 +87,6 @@ install -D -m 755 zdump %{buildroot}%{_sbindir}/zdump
install -D -m 755 zic %{buildroot}%{_sbindir}/zic
%post
if [ -f /etc/sysconfig/clock ];
then
. /etc/sysconfig/clock
if [ -n "$TIMEZONE" -a -f /etc/localtime -a -f /usr/share/zoneinfo/$TIMEZONE ]; then
%if 0%{?suse_version} >= 1230
ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime
%else
new=$(mktemp /etc/localtime.XXXXXXXX) || exit 1
cp -fl /usr/share/zoneinfo/$TIMEZONE $new 2>/dev/null || cp -fp /usr/share/zoneinfo/$TIMEZONE $new
mv -f $new /etc/localtime
%endif
else
[ ! -f /etc/localtime ] || echo "WARNING: Not updating /etc/localtime with new zone file" >&2
fi
fi
if [ ! -L /usr/share/zoneinfo/posixrules ]; then
rm -f /usr/share/zoneinfo/posixrules
ln -sf /etc/localtime /usr/share/zoneinfo/posixrules