From 4a5d12e071f521ee2d1e17815c2cf3490b62b6f5 Mon Sep 17 00:00:00 2001
From: Fernando Fernandez Mancera <ffmancera@riseup.net>
Date: Fri, 20 Jan 2023 12:38:58 +0100
Subject: [PATCH] Upgrade to 1.42-rc1 (1.41.90) (release candidate)

---
 .gitignore          |  1 +
 NetworkManager.spec | 18 +++++++++++-------
 sources             |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3781e57..80dd760 100644
--- a/.gitignore
+++ b/.gitignore
@@ -424,3 +424,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.41.6.tar.xz
 /NetworkManager-1.41.7.tar.xz
 /NetworkManager-1.41.8.tar.xz
+/NetworkManager-1.41.90.tar.xz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 3bc863f..1a81669 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -5,7 +5,7 @@
 %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
 
 %global epoch_version 1
-%global real_version 1.41.8
+%global real_version 1.41.90
 %global rpm_version %{real_version}
 %global release_version 1
 %global snapshot %{nil}
@@ -250,7 +250,6 @@ BuildRequires: gnutls-devel >= 2.12
 %else
 BuildRequires: nss-devel >= 3.11.7
 %endif
-BuildRequires: dhclient
 BuildRequires: readline-devel
 BuildRequires: audit-libs-devel
 %if %{with regen_docs}
@@ -605,8 +604,9 @@ Preferably use nmcli instead.
 %if %{with test}
 	--werror \
 %endif
-	-Dnft=/usr/sbin/nft \
-	-Diptables=/usr/sbin/iptables \
+	-Dnft=%{_sbindir}/nft \
+	-Diptables=%{_sbindir}/iptables \
+	-Ddhclient=%{_sbindir}/dhclient \
 	-Ddhcpcanon=no \
 	-Ddhcpcd=no \
 	-Dconfig_dhcp_default=%{dhcp_default} \
@@ -734,9 +734,9 @@ autoreconf --install --force
 	--with-runstatedir=%{_rundir} \
 	--enable-silent-rules=no \
 	--enable-static=no \
-	--with-nft=/usr/sbin/nft \
-	--with-iptables=/usr/sbin/iptables \
-	--with-dhclient=yes \
+	--with-nft=%{_sbindir}/nft \
+	--with-iptables=%{_sbindir}/iptables \
+	--with-dhclient=%{_sbindir}/dhclient \
 	--with-dhcpcd=no \
 	--with-dhcpcanon=no \
 	--with-config-dhcp-default=%{dhcp_default} \
@@ -1224,6 +1224,10 @@ fi
 
 
 %changelog
+* Fri Jan 20 2023 Fernando Fernandez Mancera <ffmancera@riseup.net> - 1:1.41.90-1
+- Update to 1.42-rc1 (1.41.90) (release candidate)
+- Upstream sync specfile
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.41.8-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index 6ae0f4d..0afc3d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.41.8.tar.xz) = 5c4595e86c5f92b5e184a769e62041bbffcb2e801852241595831c9bca9b9de97a3cc0b35196296cd9f5d148e1230b7bdb32bb300db37aeaf784e4f34488bd1a
+SHA512 (NetworkManager-1.41.90.tar.xz) = 49d717868d7a1aae305b2ef2f384f0a63cd2d7ac723dadf31012cf504f8c471e5145460c60f605c927bfa4362f7a7d6a5d9ebf824097c04ed44774db8b894e20