From a367f8770be1db6b6ef5a1926a18fd1ce4fe6120 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 26 Jul 2024 10:30:31 +0200 Subject: [PATCH] rpm: add "Obsoletes" for removed ifcfg packages in F41 Add the "Obsoletes" to the removed ifcfg packages, so that they are properly removed on upgrade. Otherwise, the upgrade to the new NM fails due to failed dependencies. Fixes: 777418dfd786 ('rpm: disable ifcfg support in Fedora 41') https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2001 --- contrib/fedora/rpm/NetworkManager.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 452a61129..3c44d7f9e 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -231,6 +231,14 @@ Obsoletes: NetworkManager-initscripts-ifcfg-rh < 1:1.47.5-3 Obsoletes: NetworkManager-dispatcher-routing-rules < 1:1.47.5-3 %endif +%if 0%{?fedora} >= 41 +%if %{without ifcfg_rh} +Obsoletes: NetworkManager-initscripts-ifcfg-rh < 1:1.49-3.1 +Obsoletes: NetworkManager-dispatcher-routing-rules < 1:1.49.3-1 +Obsoletes: NetworkManager-initscripts-updown < 1:1.49.3-1 +%endif +%endif + Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1 Conflicts: NetworkManager-pptp < 1:0.7.0.99-1