From 5ef81dc0fbbe41b85abe7929563d41b03eaf6989 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 3 Sep 2018 18:29:12 +0200
Subject: [PATCH] contrib/rpm: change default DHCP plugin to internal

... but keep "dhclient" on Fedora and RHEL <= 7.

https://bugzilla.redhat.com/show_bug.cgi?id=1571655
---
 contrib/fedora/rpm/NetworkManager.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index d23545e9a6..b74cff5d75 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -101,6 +101,12 @@
 %global with_modem_manager_1 0
 %endif
 
+%if 0%{fedora} || 0%{?rhel} <= 7
+%global dhcp_default dhclient
+%else
+%global dhcp_default internal
+%endif
+
 ###############################################################################
 
 Name: NetworkManager
@@ -464,7 +470,7 @@ intltoolize --automake --copy --force
 	--with-dhclient=yes \
 	--with-dhcpcd=no \
 	--with-dhcpcanon=no \
-	--with-config-dhcp-default=dhclient \
+	--with-config-dhcp-default=%{dhcp_default} \
 %if %{with crypto_gnutls}
 	--with-crypto=gnutls \
 %else