diff --git a/timezone-java.changes b/timezone-java.changes index 4b97864..cc6d438 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -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 diff --git a/timezone.changes b/timezone.changes index 4b97864..cc6d438 100644 --- a/timezone.changes +++ b/timezone.changes @@ -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 diff --git a/timezone.spec b/timezone.spec index c5d232c..9fe9669 100644 --- a/timezone.spec +++ b/timezone.spec @@ -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