From fbfe0a25124544899ef3bd162eb6c4f6668026f5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 22 2021 04:19:57 +0000
Subject: import NetworkManager-1.32.3-0.z.3.d8706caef2.el8


---

diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata
index 95e6839..5d868ad 100644
--- a/.NetworkManager.metadata
+++ b/.NetworkManager.metadata
@@ -1 +1 @@
-5673766ea76c3b867a5ec89876a05a2efe23cab7 SOURCES/NetworkManager-1.32.3-0.z.2.20e3975fd2.tar.xz
+b3635a0c53cdb2954301d93ec52d605dabf82159 SOURCES/NetworkManager-1.32.3-0.z.3.d8706caef2.tar.xz
diff --git a/.gitignore b/.gitignore
index 96f312e..b36363a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/NetworkManager-1.32.3-0.z.2.20e3975fd2.tar.xz
+SOURCES/NetworkManager-1.32.3-0.z.3.d8706caef2.tar.xz
diff --git a/SOURCES/9999-fix-pregen-doc.patch b/SOURCES/9999-fix-pregen-doc.patch
new file mode 100644
index 0000000..572f351
--- /dev/null
+++ b/SOURCES/9999-fix-pregen-doc.patch
@@ -0,0 +1,44 @@
+From b0bd54da20c0757c81f9086d187547cb0532a8a0 Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Tue, 27 Aug 2019 15:47:32 +0200
+Subject: [PATCH] patch documentation with the proper default values
+
+We don't regenerate the documentation for RHEL builds, but
+the docs from the tarball are generated with a certain set
+of defaults.
+
+Patch the man pages with the proper values.
+---
+ docs/api/html/NetworkManager.conf.html | 2 +-
+ man/NetworkManager.conf.5              | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
+index 035fd4811f..00432090db 100644
+--- a/docs/api/html/NetworkManager.conf.html
++++ b/docs/api/html/NetworkManager.conf.html
+@@ -628,7 +628,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
+           are "<code class="literal">syslog</code>" and "<code class="literal">journal</code>".
+           When NetworkManager is started with "<code class="literal">--debug</code>"
+           in addition all messages will be printed to stderr.
+-          If unspecified, the default is "<code class="literal">syslog</code>".
++          If unspecified, the default is "<code class="literal">journal</code>".
+           </p></td>
+ </tr>
+ <tr>
+diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
+index cf94846780..ac3df6082e 100644
+--- a/man/NetworkManager.conf.5
++++ b/man/NetworkManager.conf.5
+@@ -640,7 +640,7 @@ INFO\&.
+ .PP
+ \fIbackend\fR
+ .RS 4
+-The logging backend\&. Supported values are "syslog" and "journal"\&. When NetworkManager is started with "\-\-debug" in addition all messages will be printed to stderr\&. If unspecified, the default is "syslog"\&.
++The logging backend\&. Supported values are "syslog" and "journal"\&. When NetworkManager is started with "\-\-debug" in addition all messages will be printed to stderr\&. If unspecified, the default is "journal"\&.
+ .RE
+ .PP
+ \fIaudit\fR
+-- 
+2.29.2
+
diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec
index 0ef8aa0..dc3d639 100644
--- a/SPECS/NetworkManager.spec
+++ b/SPECS/NetworkManager.spec
@@ -6,10 +6,14 @@
 
 %global epoch_version 1
 %global rpm_version 1.32.3
-%global real_version 1.32.3
-%global release_version 0.z.2.20e3975fd2
-%global snapshot %{nil}
-%global git_sha %{nil}
+%global release_version 0
+%global snapshot z.3
+%global git_sha d8706caef2
+%if "x%{?snapshot}" != "x"
+%global real_version %{rpm_version}-%{release_version}.%{snapshot}.%{git_sha}
+%else
+%global real_version %{rpm_version}
+%endif
 
 %global obsoletes_device_plugins 1:0.9.9.95-1
 %global obsoletes_ppp_plugin     1:1.5.3
@@ -179,7 +183,7 @@ Group: System Environment/Base
 License: GPLv2+ and LGPLv2+
 URL: https://networkmanager.dev/
 
-Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}-%{release_version}.tar.xz
+Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}.tar.xz
 Source1: NetworkManager.conf
 Source2: 00-server.conf
 Source4: 20-connectivity-fedora.conf
@@ -195,6 +199,12 @@ Patch2: 0002-firewall-Default-to-iptables-backend-to-preserve-behavior.patch
 # Bugfixes that are only relevant until next rebase of the package.
 #Patch1000: 1000-some.patch
 
+# The pregenerated docs contain default values and paths that depend
+# on the configure options when creating the source tarball.
+# As last step, patch the documentation with the proper defaults
+# for RHEL.
+Patch9999: 9999-fix-pregen-doc.patch
+
 Requires(post): systemd
 Requires(post): /usr/sbin/update-alternatives
 Requires(preun): systemd
@@ -1157,6 +1167,9 @@ fi
 
 
 %changelog
+* Fri Jul 16 2021 Gris Ge <fge@redhat.com> - 1.32.3-0.z.3.d8706caef2
+- Upgrade to prerelese of 1.32.3 (commit d8706caef2). RHBZ#1934465
+
 * Wed Jul 14 2021 Gris Ge <fge@redhat.com> - 1.32.3-0.z.2.20e3975fd2
 - Update to prerelese of 1.32.3 (commit 20e3975fd2). RHBZ#1934465