diff --git a/sources b/sources index f53c8e5..aae22cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-246.tar.gz) = 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f +SHA512 (systemd-246.1.tar.gz) = 76a4236343237be9f647e11df71524d39222bbb2e2de03594982eb1c17547c846a77d18f129b01eeab9afe734900b3b4a7f050ba1eec7f3448bbcd21677d4e45 diff --git a/systemd.spec b/systemd.spec index efd5996..6847bc1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,7 +1,7 @@ #global commit 7f56c26d1041e686efa72b339250a98fb6ee8f00 %{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})} -#global stable 1 +%global stable 1 # We ship a .pc file but don't want to have a dep on pkg-config. We # strip the automatically generated dep here and instead co-own the @@ -19,7 +19,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd -Version: 246 +Version: 246.1 Release: 1%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ @@ -627,12 +627,13 @@ fi # This is for upgrades from previous versions before systemd-resolved became the default. systemctl --no-reload preset systemd-resolved.service &>/dev/null || : -grep -q 'Generated by NetworkManager' /etc/resolv.conf 2>/dev/null && \ - echo -e '/etc/resolv.conf was generated by NetworkManager.\nConsider removing it to let systemd-resolved manage this file.' \ - || : - +%triggerun -- systemd < 246.1-1 if systemctl is-enabled systemd-resolved.service &>/dev/null; then - systemctl start systemd-resolved.service &>/dev/null; + grep -q 'Generated by NetworkManager' /etc/resolv.conf 2>/dev/null && \ + echo -e '/etc/resolv.conf was generated by NetworkManager.\nRemoving it to let systemd-resolved manage this file.' && \ + mv -v /etc/resolv.conf /etc/resolv.conf.orig-with-nm || : + + systemctl start systemd-resolved.service &>/dev/null || : fi %post libs @@ -788,6 +789,11 @@ fi %files tests -f .file-list-tests %changelog +* Fri Aug 7 2020 Zbigniew Jędrzejewski-Szmek - 246.1-1 +- A few minor bugfixes +- Remove /etc/resolv.conf on upgrades (if managed by NetworkManager), so + that systemd-resolved can take over the management of the symlink. + * Thu Jul 30 2020 Zbigniew Jędrzejewski-Szmek - 246-1 - Update to released version. Only some minor bugfixes since the pre-release.