From 7d62f81e2ecf66498bb7eafca74eca5f2570728c Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 17 Apr 2019 20:06:44 +0200 Subject: [PATCH] contrib/rpm: Provide list of units to %systemd_postun %systemd_postun is meant to be run with arguments and Fedora Rawhide seems to enforce this now. Therefore provide the units there, too. https://github.com/NetworkManager/NetworkManager/pull/348 --- contrib/fedora/rpm/NetworkManager.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 0e78fde261..c237866a87 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -41,6 +41,8 @@ %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p') +%global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service + ############################################################################### %bcond_with meson @@ -777,7 +779,7 @@ fi /usr/bin/udevadm control --reload-rules || : /usr/bin/udevadm trigger --subsystem-match=net || : -%systemd_post NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service +%systemd_post %{systemd_units} %triggerin -- initscripts if [ -f %{_sbindir}/ifup -a ! -L %{_sbindir}/ifup ]; then @@ -806,7 +808,7 @@ fi /usr/bin/udevadm control --reload-rules || : /usr/bin/udevadm trigger --subsystem-match=net || : -%systemd_postun +%systemd_postun %{systemd_units} %if (0%{?fedora} && 0%{?fedora} < 28) || 0%{?rhel}