From 9e3b7b2e99fa381d848ddfa816dcfcbbf1658bf2 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 11 May 2021 14:34:18 +0200 Subject: [PATCH] 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