From 8f6dfee152ab1160ae1bab4fd0671c787da24642 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 1 Jun 2022 17:15:08 +0200
Subject: [PATCH] Update to 1.39.6 release (development)

Related: #2077392
---
 .gitignore          |  1 +
 NetworkManager.spec | 12 ++++++++----
 sources             |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce54396..0e9e3d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -410,3 +410,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.39.2.tar.xz
 /NetworkManager-1.39.3.tar.xz
 /NetworkManager-1.39.5.tar.xz
+/NetworkManager-1.39.6.tar.xz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 6d440e6..fb79e3c 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.39.5
+%global real_version 1.39.6
 %global rpm_version %{real_version}
 %global release_version 1
 %global snapshot %{nil}
@@ -1091,9 +1091,6 @@ fi
 %if %{with firewalld_zone}
 %{_prefix}/lib/firewalld/zones/nm-shared.xml
 %endif
-%if 0%{?ifcfg_warning}
-%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
-%endif
 # systemd stuff
 %{_unitdir}/NetworkManager.service
 %{_unitdir}/NetworkManager-wait-online.service
@@ -1101,6 +1098,9 @@ fi
 %{_unitdir}/nm-priv-helper.service
 %dir %{_datadir}/doc/NetworkManager/examples
 %{_datadir}/doc/NetworkManager/examples/server.conf
+%if 0%{?ifcfg_warning}
+%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
+%endif
 %doc NEWS AUTHORS README.md CONTRIBUTING.md
 %license COPYING
 %license COPYING.LGPL
@@ -1240,6 +1240,10 @@ fi
 
 
 %changelog
+* Wed Jun  1 2022 Beniamino Galvani <bgalvani@redhat.com> - 1:1.39.6-1
+- Update to 1.39.6 release (development)
+- Implement ACD (address conflict detection) for DHCPv4 (rh #1713380)
+
 * Thu May 19 2022 Ana Cabral <acabral@redhat.com> - 1:1.39.5-1
 - Update to 1.39.5 release (development)
 - dhcp: fix ignoring addresses with DHCPv6 otherconf (O flag) (rh #2083968)
diff --git a/sources b/sources
index 6ca641c..f47769c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.39.5.tar.xz) = 56b7251829d6ae0defb7f5d695f4d601564374f9da8ca9f44c2be2d6504826854aae8b19b0021fb6b8de3ca3ca41a2ded64473b43ba165cb4efddaeb428af150
+SHA512 (NetworkManager-1.39.6.tar.xz) = 561e3cbb200ffacd2f1bdf4071fa55ededac2cc208222c61b93d2de70819b6bc23edec971ae3a15d190001fe15650776cd32b77ce0084ecd5ed15e55ed8c2768