colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the versions number from which packages are obsoleted directly instead of using global variables

Browse Source
This commit is contained in:
Stanislas FAYE
2024-05-27 14:46:09 +02:00
committed by Stanislas Faye
parent 613f16de51
commit 3f3472c971
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/fedora/rpm/NetworkManager.spec
View File

@@ -26,9 +26,6 @@
%global obsoletes_ppp_plugin 1:1.5.3 %global obsoletes_ppp_plugin 1:1.5.3
%global obsoletes_initscripts_updown 1:1.36.0-0.6 %global obsoletes_initscripts_updown 1:1.36.0-0.6
%global obsoletes_ifcfg_rh 1:1.36.2 %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 nmlibdir %{_prefix}/lib/%{name}
%global nmplugindir %{_libdir}/%{name}/%{version}-%{release} %global nmplugindir %{_libdir}/%{name}/%{version}-%{release}
@@ -263,9 +260,9 @@ Requires: wpa_supplicant >= 1:1.1
%endif %endif
%if 0%{?rhel} && 0%{?rhel} >= 10 %if 0%{?rhel} && 0%{?rhel} >= 10
Obsoletes: NetworkManager-team < %{obsoletes_team} Obsoletes: NetworkManager-team < 1:1.47.5-3
Obsoletes: NetworkManager-initscripts-ifcfg-rh < %{obsoletes_initscripts_ifcfg_rh} Obsoletes: NetworkManager-initscripts-ifcfg-rh < 1:1.47.5-3
Obsoletes: NetworkManager-dispatcher-routing-rules < %{obsoletes_dispatcher_routing_rules} Obsoletes: NetworkManager-dispatcher-routing-rules < 1:1.47.5-3
%endif %endif
Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1