From 78567631e1fd844dc99099ee8b939ab4ba1951d4 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Fri, 30 Jul 2021 17:11:29 +0800 Subject: [PATCH] Upgrade to 1.32.6 release Resolves: RHBZ#1966123 Signed-off-by: Gris Ge --- .gitignore | 1 + 9999-fix-pregen-doc.patch | 12 ++++++------ NetworkManager.spec | 7 +++++-- sources | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 825d14e..6520eb6 100644 --- a/.gitignore +++ b/.gitignore @@ -390,3 +390,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.32.0.tar.xz /NetworkManager-1.32.2.tar.xz /NetworkManager-1.32.4.tar.xz +/NetworkManager-1.32.6.tar.xz diff --git a/9999-fix-pregen-doc.patch b/9999-fix-pregen-doc.patch index 572f351..6e6485f 100644 --- a/9999-fix-pregen-doc.patch +++ b/9999-fix-pregen-doc.patch @@ -1,4 +1,4 @@ -From b0bd54da20c0757c81f9086d187547cb0532a8a0 Mon Sep 17 00:00:00 2001 +From f7019f666002878544e2d9de23321bd19a60a808 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 @@ -14,10 +14,10 @@ Patch the man pages with the proper values. 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 +index e348806a1eb1..377d4f7d56cc 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 +@@ -658,7 +658,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. @@ -27,10 +27,10 @@ index 035fd4811f..00432090db 100644 diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 -index cf94846780..ac3df6082e 100644 +index efb79accfd2a..07d8dda62147 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 -@@ -640,7 +640,7 @@ INFO\&. +@@ -664,7 +664,7 @@ INFO\&. .PP \fIbackend\fR .RS 4 @@ -40,5 +40,5 @@ index cf94846780..ac3df6082e 100644 .PP \fIaudit\fR -- -2.29.2 +2.31.1 diff --git a/NetworkManager.spec b/NetworkManager.spec index ca5f753..ea52b59 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -5,8 +5,8 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global rpm_version 1.32.4 -%global real_version 1.32.4 +%global rpm_version 1.32.6 +%global real_version 1.32.6 %global release_version 1 %global snapshot %{nil} %global git_sha %{nil} @@ -1161,6 +1161,9 @@ fi %changelog +* Fri Jul 30 2021 Gris Ge - 1:1.32.6-1 +- Upgrade to 1.32.6 release + * Tue Jul 27 2021 Gris Ge - 1:1.32.4-1 - Upgrade to 1.32.4 release - core/wwan: avoid assertion failure in modem_ip{4,6}_config_result() (rh #1916192) diff --git a/sources b/sources index fcbf8ae..772a1a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.32.4.tar.xz) = 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684 +SHA512 (NetworkManager-1.32.6.tar.xz) = 7556e8c3934a83320646336bcaffc010a91258c1ab669596e4b7ece98eb35e1d1ae625bca0de3781638e0a186656de61d554ef8722beea6bc29cdb0c70314b1d