Resolve NM dependency issues after disabling of team and ifcfg-rh

Related: RHEL-32948
This commit is contained in:
Stanislas FAYE 2024-04-26 11:04:47 +02:00
parent 0a387cee26
commit 8ba22d1be3

View File

@ -6,7 +6,7 @@
%global epoch_version 1
%global real_version 1.47.5
%global rpm_version %{real_version}
%global release_version 2
%global release_version 3
%global snapshot %{nil}
%global git_sha %{nil}
%global bcond_default_debug 0
@ -17,6 +17,9 @@
%global obsoletes_ppp_plugin 1:1.5.3
%global obsoletes_initscripts_updown 1:1.36.0-0.6
%global obsoletes_ifcfg_rh 1:1.36.2
%global obsoletes_team 1:1.47.5-3
%global obsoletes_initscripts_ifcfg_rh 1:1.47.5-3
%global obsoletes_dispatcher_routing_rules 1:1.47.5-3
%global nmlibdir %{_prefix}/lib/%{name}
%global nmplugindir %{_libdir}/%{name}/%{version}-%{release}
@ -245,11 +248,18 @@ Obsoletes: NetworkManager < %{obsoletes_ifcfg_rh}
Requires: wpa_supplicant >= 1:1.1
%endif
Obsoletes: NetworkManager-team < %{obsoletes_team}
Obsoletes: NetworkManager-initscripts-ifcfg-rh < %{obsoletes_initscripts_ifcfg_rh}
Obsoletes: NetworkManager-dispatcher-routing-rules < %{obsoletes_dispatcher_routing_rules}
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
Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1
Conflicts: kde-plasma-networkmanagement < 1:0.9-0.49.20110527git.nm09
Conflicts: NetworkManager-team <= 1:1.47.5-3
Conflicts: NetworkManager-initscripts-ifcfg-rh <= 1:1.47.5-3
Conflicts: NetworkManager-dispatcher-routing-rules <= 1:1.47.5-3
BuildRequires: make
BuildRequires: gcc