update to 1.28-rc1 (1.27.90)

This commit is contained in:
Thomas Haller 2020-10-06 10:13:47 +02:00
parent 103896827d
commit 36c0fdc256
No known key found for this signature in database
GPG Key ID: 29C2366E4DFC5728
4 changed files with 16 additions and 45 deletions

1
.gitignore vendored
View File

@ -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.27.90.tar.xz

View File

@ -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

View File

@ -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.28.0
%global real_version 1.27.90
%global release_version 0.1
%global snapshot %{nil}
%global git_sha %{nil}
@ -107,7 +107,11 @@
%if 0%{?fedora} || 0%{?rhel} > 7
%global logging_backend_default journal
%if 0%{?fedora} || 0%{?rhel} > 8
%global dns_rc_manager_default auto
%else
%global dns_rc_manager_default symlink
%endif
%else
%global logging_backend_default syslog
%global dns_rc_manager_default file
@ -154,7 +158,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
@ -633,6 +636,8 @@ This tool is still experimental.
%endif
-Ddist_version=%{version}-%{release} \
-Dconfig_plugins_default=%{config_plugins_default} \
-Dresolvconf=no \
-Dnetconfig=no \
-Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \
-Dconfig_logging_backend_default=%{logging_backend_default} \
-Djson_validation=true
@ -771,6 +776,8 @@ intltoolize --automake --copy --force
%endif
--with-dist-version=%{version}-%{release} \
--with-config-plugins-default=%{config_plugins_default} \
--with-resolvconf=no \
--with-netconfig=no \
--with-config-dns-rc-manager-default=%{dns_rc_manager_default} \
--with-config-logging-backend-default=%{logging_backend_default} \
--enable-json-validation
@ -1096,6 +1103,9 @@ fi
%changelog
* Tue Oct 6 2020 Thomas Haller <thaller@redhat.com> - 1:1.28.0-0.1
- update to 1.28-rc1 (1.27.90)
* Sat Sep 19 2020 Yaroslav Fedevych <yaroslav@fedevych.name> - 1:1.26.2-2
- fix build failure due to generating invalid XML documentation

View File

@ -1 +1 @@
SHA512 (NetworkManager-1.26.2.tar.xz) = 4029bf5224523d851a36766376813c7edc85c2fef3600ceaffc0c7e6faadcfebf843a406ee071bdc59c21bceb7bf3de8c87fca6bb2f2116d9eddbb70e11bf517
SHA512 (NetworkManager-1.27.90.tar.xz) = 05d6934c4c17fb9b340ff3afbb6aafdbc6dd9191b465ea5bbff9370c6f1ac5c7a91de046d00488b6d9af89af64f86cc62daeda8963cc58796edf5c681aab6ae1