From 46a78c9b1469d82bad9e2fc63b2a2337ae3aaab1 Mon Sep 17 00:00:00 2001
From: Yaroslav Fedevych <jarek@leanst.com>
Date: Sat, 19 Sep 2020 16:12:06 +0200
Subject: [PATCH] Backport a XML generation fix so the package builds correctly

https://src.fedoraproject.org/rpms/NetworkManager/pull-request/5
---
 0001-nm-fix-generated-xml-docs-syntax.patch | 19 +++++++++++++++++++
 NetworkManager.spec                         |  6 +++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 0001-nm-fix-generated-xml-docs-syntax.patch

diff --git a/0001-nm-fix-generated-xml-docs-syntax.patch b/0001-nm-fix-generated-xml-docs-syntax.patch
new file mode 100644
index 0000000..bd51210
--- /dev/null
+++ b/0001-nm-fix-generated-xml-docs-syntax.patch
@@ -0,0 +1,19 @@
+diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
+index ebda99560a..317b32972a 100755
+--- a/tools/generate-docs-nm-settings-docs-gir.py
++++ b/tools/generate-docs-nm-settings-docs-gir.py
+@@ -244,8 +244,12 @@ def usage():
+             "%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 = {
diff --git a/NetworkManager.spec b/NetworkManager.spec
index cebbefb..50ea54c 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,7 +7,7 @@
 %global epoch_version 1
 %global rpm_version 1.26.2
 %global real_version 1.26.2
-%global release_version 1
+%global release_version 2
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -154,6 +154,7 @@ 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
@@ -1095,6 +1096,9 @@ fi
 
 
 %changelog
+* Sat Sep 19 2020 Yaroslav Fedevych <yaroslav@fedevych.name> - 1:1.26.2-2
+- backport commit 54e25f23f53af889703dfc50d51a8afeeea8a439 which fixes building the package by producing well-formed XML documentation
+
 * Wed Aug 19 2020 Thomas Haller <thaller@redhat.com> - 1:1.26.2-1
 - update to 1.26.2
 - enable link time optimization (LTO).