import NetworkManager-1.36.0-0.9.el8

.NetworkManager.metadata

@@ -1 +1 @@
-68c3290bf24ece6cb4d76014be1d3a0793874c7f SOURCES/NetworkManager-1.35.91.tar.xz
+2a25bc5642fd70750f98f252e95196739dc24a61 SOURCES/NetworkManager-1.35.92.tar.xz

.gitignore

@@ -1 +1 @@
-SOURCES/NetworkManager-1.35.91.tar.xz
+SOURCES/NetworkManager-1.35.92.tar.xz

SOURCES/9999-fix-pregen-doc.patch

@@ -0,0 +1,44 @@
+From 9603d930557bcd8268c3e36897db9941ea3af0b7 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 02029c2e336a..cf9269c7bef4 100644
+--- a/docs/api/html/NetworkManager.conf.html
++++ b/docs/api/html/NetworkManager.conf.html
+@@ -663,7 +663,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 4f62ed7c0cde..74daf4c8dc02 100644
+--- a/man/NetworkManager.conf.5
++++ b/man/NetworkManager.conf.5
+@@ -669,7 +669,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.31.1
+

SPECS/NetworkManager.spec

@@ -6,8 +6,8 @@
 
 %global epoch_version 1
 %global rpm_version 1.36.0
-%global real_version 1.35.91
+%global real_version 1.35.92
-%global release_version 0.8
+%global release_version 0.9
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -33,7 +33,7 @@
 
 %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[0-9][0-9]*\\)\\.[0-9][0-9]*$/\\1/p')
 
-%global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service
+%global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service
 
 %global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer
 
@@ -61,7 +61,8 @@
 %bcond_without ppp
 %bcond_without nmtui
 %bcond_without nm_cloud_setup
-%bcond_without regen_docs
+# on RHEL we don't regenerate the documentation
+%bcond_with    regen_docs
 %if %{bcond_default_debug}
 %bcond_without debug
 %else
@@ -195,6 +196,12 @@ Patch2: 0002-firewall-Default-to-iptables-backend-to-preserve-behavior.patch
 # Bugfixes that are only relevant until next rebase of the package.
 # Patch1001: 1001-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
 %if 0%{?fedora} || 0%{?rhel} > 7
 Requires(post): systemd-udev
@@ -960,7 +967,7 @@ if [ $1 -eq 0 ]; then
     # Don't kill networking entirely just on package remove
     #/bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || :
 fi
-%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service
+%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service
 
 
 %preun initscripts-updown
@@ -1000,7 +1007,7 @@ fi
 %files
 %{dbus_sys_dir}/org.freedesktop.NetworkManager.conf
 %{dbus_sys_dir}/nm-dispatcher.conf
-%{dbus_sys_dir}/nm-priv-helper.conf
+%exclude %{dbus_sys_dir}/nm-priv-helper.conf
 %{dbus_sys_dir}/nm-ifcfg-rh.conf
 %{_sbindir}/%{name}
 %{_bindir}/nmcli
@@ -1021,7 +1028,7 @@ fi
 %{_libexecdir}/nm-dispatcher
 %{_libexecdir}/nm-initrd-generator
 %{_libexecdir}/nm-daemon-helper
-%{_libexecdir}/nm-priv-helper
+%exclude %{_libexecdir}/nm-priv-helper
 %dir %{_libdir}/%{name}
 %dir %{nmplugindir}
 %{nmplugindir}/libnm-settings-plugin*.so
@@ -1055,7 +1062,7 @@ fi
 %{systemd_dir}/NetworkManager.service
 %{systemd_dir}/NetworkManager-wait-online.service
 %{systemd_dir}/NetworkManager-dispatcher.service
-%{systemd_dir}/nm-priv-helper.service
+%exclude %{systemd_dir}/nm-priv-helper.service
 %dir %{_datadir}/doc/NetworkManager/examples
 %{_datadir}/doc/NetworkManager/examples/server.conf
 %doc NEWS AUTHORS README CONTRIBUTING.md TODO
@@ -1190,6 +1197,14 @@ fi
 
 
 %changelog
+* Sat Feb 19 2022 Lubomir Rintel <lkundrak@v3.sk> - 1:1.36.0-0.9
+- revert: generate docs during build instead of using pre-generated (rh #1995915)
+- Upgrade to 1.35.92 (release candidate)
+- ppp: increase disconnect timeout (rh #2049596)
+- core: finish activation after all objects are committed (rh #2043133)
+- ipv6: add support for multipath routes (rh #1837254)
+- keyfile: do not write empty string list properties (rh #2022623)
+
 * Fri Feb 04 2022 Lubomir Rintel <lkundrak@v3.sk> - 1:1.36.0-0.8
 - Upgrade to 1.35.91 release (release candidate)
 - bond: fix duplicate IPv4 address detection (rh #2028751)