Update to 1.26.4

.gitignore

@@ -377,3 +377,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.25.90.tar.xz
 /NetworkManager-1.26.0.tar.xz
 /NetworkManager-1.26.2.tar.xz
+/NetworkManager-1.26.4.tar.xz

0001-nm-fix-generated-xml-docs-syntax.patch

@@ -1,40 +0,0 @@
-From e2e655cdc588457ede0e1bec070d85d531ad6bdd Mon Sep 17 00:00:00 2001
-From: Valentin David <valentin.david@codethink.co.uk>
-Date: Tue, 8 Sep 2020 17:15:30 +0200
-Subject: [PATCH 1/1] build/docs: fix generated XML syntax in
- tools/generate-docs-nm-settings-docs-gir.py
-
-Class description may contains double quotes which is not valid as XML
-attribute value.
-
-[thaller@redhat.com: adjust original patch to reformat code with python black]
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/620
-(cherry picked from commit 54e25f23f53af889703dfc50d51a8afeeea8a439)
-(cherry picked from commit 7d26773138dd4270c45e131761d4e6be58f64d12)
----
- tools/generate-docs-nm-settings-docs-gir.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
-index ebda99560a70..317b32972a46 100755
---- a/tools/generate-docs-nm-settings-docs-gir.py
-+++ b/tools/generate-docs-nm-settings-docs-gir.py
-@@ -244,8 +244,12 @@ for settingxml in settings:
-             "%s needs a gtk-doc block with one-line description" % setting.props.name
-         )
-     outfile.write(
--        '  <setting name="%s" description="%s" name_upper="%s" >\n'
--        % (setting.props.name, class_desc, get_setting_name_define(settingxml))
-+        '  <setting name="%s" description=%s name_upper="%s" >\n'
-+        % (
-+            setting.props.name,
-+            xml_quoteattr(class_desc),
-+            get_setting_name_define(settingxml),
-+        )
-     )
- 
-     setting_properties = {
--- 
-2.26.2
-

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.26.2
-%global real_version 1.26.2
-%global release_version 2
+%global rpm_version 1.26.4
+%global real_version 1.26.4
+%global release_version 1
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -154,7 +154,6 @@ Source5: 20-connectivity-redhat.conf
 Source6: 70-nm-connectivity.conf
 
 #Patch1: 0001-some.patch
-Patch1: 0001-nm-fix-generated-xml-docs-syntax.patch
 
 Requires(post): systemd
 Requires(post): /usr/sbin/update-alternatives
@@ -1096,6 +1095,10 @@ fi
 
 
 %changelog
+* Wed Oct 14 2020 Beniamino Galvani <bgalvani@redhat.com> - 1:1.26.4-1
+- update to 1.26.4
+- dns: add wildcard domain to VPNs with never-default=no and no domains (rh #1863041)
+
 * Sat Sep 19 2020 Yaroslav Fedevych <yaroslav@fedevych.name> - 1:1.26.2-2
 - fix build failure due to generating invalid XML documentation
 

sources

@@ -1 +1 @@
-SHA512 (NetworkManager-1.26.2.tar.xz) = 4029bf5224523d851a36766376813c7edc85c2fef3600ceaffc0c7e6faadcfebf843a406ee071bdc59c21bceb7bf3de8c87fca6bb2f2116d9eddbb70e11bf517
+SHA512 (NetworkManager-1.26.4.tar.xz) = 91e865c83a6ae694c9f6aa50e7f938dfa55bfddac32a6dfb73e6edb34b2539068ff9f83bf662bb2d689bd3c66cf53d7fa015930940cf7bda2d4a16561cf02328