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

contrib/rpm: stop conditionalizing default DHCP client

Browse Source 
It's the same on all systems we care about.
This commit is contained in:
Lubomir Rintel
2024-07-09 17:42:21 +02:00
parent 811ef6952d
commit 954e8c8d64
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,12 +141,6 @@
%global with_modem_manager_1 0 %global with_modem_manager_1 0
%endif %endif
%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
%global dhcp_default internal
%else
%global dhcp_default dhclient
%endif
%if 0%{?fedora} || 0%{?rhel} >= 8 %if 0%{?fedora} || 0%{?rhel} >= 8
%global logging_backend_default journal %global logging_backend_default journal
%if 0%{?fedora} || 0%{?rhel} >= 9 %if 0%{?fedora} || 0%{?rhel} >= 9
@@ -658,7 +652,6 @@ Preferably use nmcli instead.
-Ddhclient=%{_sbindir}/dhclient \ -Ddhclient=%{_sbindir}/dhclient \
-Ddhcpcanon=no \ -Ddhcpcanon=no \
-Ddhcpcd=no \ -Ddhcpcd=no \
-Dconfig_dhcp_default=%{dhcp_default} \
%if %{with crypto_gnutls} %if %{with crypto_gnutls}
-Dcrypto=gnutls \ -Dcrypto=gnutls \
%else %else
@@ -800,7 +793,6 @@ autoreconf --install --force
--with-dhclient=%{_sbindir}/dhclient \ --with-dhclient=%{_sbindir}/dhclient \
--with-dhcpcd=no \ --with-dhcpcd=no \
--with-dhcpcanon=no \ --with-dhcpcanon=no \
--with-config-dhcp-default=%{dhcp_default} \
%if %{with crypto_gnutls} %if %{with crypto_gnutls}
--with-crypto=gnutls \ --with-crypto=gnutls \
%else %else