From 9e3b7b2e99fa381d848ddfa816dcfcbbf1658bf2 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 11 May 2021 14:34:18 +0200 Subject: [PATCH 1/3] contrib/rpm: let NetworkManager-libnm package conflict with exact NetworkManager-glib version This "Conflicts" is since commit b85b8ed6fa6c ('contrib/rpm: let NetworkManager-libnm and NetworkManager-glib of differing version conflict'). This was probably fine back then, but NetworkManager-glib is long gone. Also, not hard coding the version number leads to rpmdiff messages like: NEEDS INSPECTION NetworkManager-libnm changed from Conflicts: NetworkManager-glib < 1:1.32.0-0.2.el8 to Conflicts: NetworkManager-glib < 1:1.32.0-0.3.el8 on all architectures As NetworkManager-glib is long gone, hard code the version with which we conflict. --- contrib/fedora/rpm/NetworkManager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index e75f26001b..8251f65814 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -447,7 +447,7 @@ This package contains NetworkManager support for PPP. %package libnm Summary: Libraries for adding NetworkManager support to applications. Group: Development/Libraries -Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release} +Conflicts: NetworkManager-glib < 1:1.31.0 License: LGPLv2+ %description libnm From 40c78fe6991033129c8ae2f73dda376989fbcd44 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 11 May 2021 14:40:41 +0200 Subject: [PATCH 2/3] contrib/rpm: obsolete "config-routing-rules" package with fixed version Since commit a447942fc030 ('contrib/rpm: rename package "NetworkManager-config-routing-rules" to "NetworkManager-dispatcher-routing-rules"'), the config-routing-rules subpackage is gone. This way to specify the version number with a variable parameter, causes repeated messages in rpmdiff: INFO NetworkManager-dispatcher-routing-rules changed from Obsoletes: NetworkManager-config-routing-rules < 1:1.32.0-0.2.el8 to Obsoletes: NetworkManager-config-routing-rules < 1:1.32.0-0.3.el8 on noarch Avoid this by hard coding the obsoleted version. --- contrib/fedora/rpm/NetworkManager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 8251f65814..be096e6293 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -515,7 +515,7 @@ Summary: NetworkManager dispatcher file for advanced routing rules Group: System Environment/Base BuildArch: noarch Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-config-routing-rules < %{epoch}:%{version}-%{release} +Obsoletes: %{name}-config-routing-rules < 1:1.31.0 %description dispatcher-routing-rules This adds a NetworkManager dispatcher file to support networking From af40a14556de25d412e233c98689597af0ff8258 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 11 May 2021 14:11:22 +0200 Subject: [PATCH 3/3] contrib/rpm: %ghost "/etc/NetworkManager/VPN" "/etc/NetworkManager/VPN" was historically the place for .name files for VPN plugins. In the meantime, those should be under "/usr/lib/NetworkManager/VPN". Still, NetworkManager honors (and possibly watches) the directory in /etc. Mark the directory as %ghost. The exact effect of this is not clear to me. It seems however right to do, and works for my testing. --- contrib/fedora/rpm/NetworkManager.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index be096e6293..ba4a14e9a8 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -977,6 +977,7 @@ fi %dir %{_sysconfdir}/%{name}/dnsmasq-shared.d %dir %{_sysconfdir}/%{name}/system-connections %config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf +%ghost %{_sysconfdir}/%{name}/VPN %{_bindir}/nm-online %{_libexecdir}/nm-ifup %ghost %attr(755, root, root) %{_sbindir}/ifup