From 91609f582e6fd716444bd740f73320ed52dfb4b7 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Mon, 31 May 2021 09:12:34 -0400 Subject: [PATCH] Update to 1.31.5 (development) Resolves: RHBZ#1915254 Signed-off-by: Wen Liang --- .gitignore | 1 + 9999-fix-pregen-doc.patch | 44 +++++++++++++++++++++++++++++++++++++++ NetworkManager.spec | 39 ++++++++++++++++++++++++---------- sources | 2 +- 4 files changed, 74 insertions(+), 12 deletions(-) create mode 100644 9999-fix-pregen-doc.patch diff --git a/.gitignore b/.gitignore index 94e5633..b4eb0eb 100644 --- a/.gitignore +++ b/.gitignore @@ -386,3 +386,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.29.90.tar.xz /NetworkManager-1.30.0.tar.xz /NetworkManager-1.30.2.tar.xz +/NetworkManager-1.31.5.tar.xz diff --git a/9999-fix-pregen-doc.patch b/9999-fix-pregen-doc.patch new file mode 100644 index 0000000..572f351 --- /dev/null +++ b/9999-fix-pregen-doc.patch @@ -0,0 +1,44 @@ +From b0bd54da20c0757c81f9086d187547cb0532a8a0 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +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 "syslog" and "journal". + When NetworkManager is started with "--debug" + in addition all messages will be printed to stderr. +- If unspecified, the default is "syslog". ++ If unspecified, the default is "journal". +

+ + +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/NetworkManager.spec b/NetworkManager.spec index 18799d6..f7c4b58 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -5,9 +5,9 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global rpm_version 1.30.2 -%global real_version 1.30.2 -%global release_version 1 +%global rpm_version 1.32.0 +%global real_version 1.31.5 +%global release_version 0.1 %global snapshot %{nil} %global git_sha %{nil} @@ -60,7 +60,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 @@ -105,7 +106,7 @@ ############################################################################### -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %global dbus_version 1.9.18 %global dbus_sys_dir %{_datadir}/dbus-1/system.d %else @@ -165,7 +166,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: %{epoch_version} Version: %{rpm_version} -Release: %{release_version}%{?snap}%{?dist}.1 +Release: %{release_version}%{?snap}%{?dist} Group: System Environment/Base License: GPLv2+ and LGPLv2+ URL: https://networkmanager.dev/ @@ -177,7 +178,18 @@ Source4: 20-connectivity-fedora.conf Source5: 20-connectivity-redhat.conf Source6: 70-nm-connectivity.conf -#Patch1: 0001-some.patch +# RHEL downstream patches that change behavior from upstream. +# These are not bugfixes, hence they are also relevant after +# the next rebase of the source tarball. + +# 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 @@ -295,7 +307,7 @@ Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release} # that the scripts that would parse the SPEC file naively would be unlikely # to fail. Refer to git log for the real date and commit number of last # synchronization: -# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commits/master/src/systemd +# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commits/main/src/ Provides: bundled(systemd) = 0 @@ -438,7 +450,7 @@ This package contains NetworkManager support for PPP. %package libnm Summary: Libraries for adding NetworkManager support to applications. Group: Development/Libraries -Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release} +Conflicts: NetworkManager-glib < 1:1.31.0 License: LGPLv2+ %description libnm @@ -506,7 +518,7 @@ Summary: NetworkManager dispatcher file for advanced routing rules Group: System Environment/Base BuildArch: noarch Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-config-routing-rules < %{epoch}:%{version}-%{release} +Obsoletes: %{name}-config-routing-rules < 1:1.31.0 %description dispatcher-routing-rules This adds a NetworkManager dispatcher file to support networking @@ -968,6 +980,7 @@ fi %dir %{_sysconfdir}/%{name}/dnsmasq-shared.d %dir %{_sysconfdir}/%{name}/system-connections %config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf +%ghost %{_sysconfdir}/%{name}/VPN %{_bindir}/nm-online %{_libexecdir}/nm-ifup %ghost %attr(755, root, root) %{_sbindir}/ifup @@ -996,6 +1009,7 @@ fi %{_mandir}/man7/nmcli-examples.7* %{_mandir}/man8/nm-initrd-generator.8.gz %{_mandir}/man8/NetworkManager.8.gz +%{_mandir}/man8/NetworkManager-dispatcher.8.gz %dir %{_localstatedir}/lib/NetworkManager %dir %{_sysconfdir}/sysconfig/network-scripts %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service @@ -1010,7 +1024,7 @@ fi %{systemd_dir}/NetworkManager-dispatcher.service %dir %{_datadir}/doc/NetworkManager/examples %{_datadir}/doc/NetworkManager/examples/server.conf -%doc NEWS AUTHORS README CONTRIBUTING TODO +%doc NEWS AUTHORS README CONTRIBUTING.md TODO %license COPYING %license COPYING.LGPL %license COPYING.GFDL @@ -1135,6 +1149,9 @@ fi %changelog +* Mon Jun 7 2021 Wen Liang - 1:1.32.0-0.1 +- Update to 1.31.5 (development) + * Thu Apr 15 2021 Mohan Boddu - 1:1.30.2-1.1 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/sources b/sources index 3ff5247..8304c11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.30.2.tar.xz) = 08482ac18814fd94bc99f0aa32de7d38c39d29c914a3080fb6df7ec2437b30f1aea1b5207edeae74ff63b9a181a4823cfa11e8884bc22ae80cb0b95f8cc3514e +SHA512 (NetworkManager-1.31.5.tar.xz) = cb1a2b70585d512f17341dcda448b96a42586a21aad1a217918aa22aebde2c9b80fd09b051daee29b0ab4b0253622d43294708c8400aac36abefa3f55271fbcf