From 954e8c8d6470ee60c194a74b073f946b87bbb691 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 9 Jul 2024 17:42:21 +0200 Subject: [PATCH] contrib/rpm: stop conditionalizing default DHCP client It's the same on all systems we care about. --- contrib/fedora/rpm/NetworkManager.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index be0f335f89..d7f5957430 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -141,12 +141,6 @@ %global with_modem_manager_1 0 %endif -%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8 -%global dhcp_default internal -%else -%global dhcp_default dhclient -%endif - %if 0%{?fedora} || 0%{?rhel} >= 8 %global logging_backend_default journal %if 0%{?fedora} || 0%{?rhel} >= 9 @@ -658,7 +652,6 @@ Preferably use nmcli instead. -Ddhclient=%{_sbindir}/dhclient \ -Ddhcpcanon=no \ -Ddhcpcd=no \ - -Dconfig_dhcp_default=%{dhcp_default} \ %if %{with crypto_gnutls} -Dcrypto=gnutls \ %else @@ -800,7 +793,6 @@ autoreconf --install --force --with-dhclient=%{_sbindir}/dhclient \ --with-dhcpcd=no \ --with-dhcpcanon=no \ - --with-config-dhcp-default=%{dhcp_default} \ %if %{with crypto_gnutls} --with-crypto=gnutls \ %else