up to 1.20.2

- updated gtk doc patch

diff --git a/NetworkManager-gtkdoc.patch b/NetworkManager-gtkdoc.patch
index 86c66ee6de3ceae7e16540682d38d0653d1a01d0..846399134406f9a9c1209e86d54e104928936334 100644 (file)
--- a/NetworkManager-gtkdoc.patch
+++ b/NetworkManager-gtkdoc.patch
@@ -1,11 +1,60 @@
---- NetworkManager-1.20.0/docs/libnm/Makefile.am.orig  2019-08-06 12:22:08.000000000 +0200
-+++ NetworkManager-1.20.0/docs/libnm/Makefile.am       2019-08-08 20:48:19.932061834 +0200
-@@ -19,7 +19,7 @@
+From a369e61d2a20493e6fcde9b6ac7e800174487a41 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Fri, 6 Sep 2019 11:00:52 +0200
+Subject: [PATCH] build: use regexp in gtkdoc --ignore-decorators option
+
+gtkdoc-scan supports regular expressions in the --ignore-decorators
+command-line option. Since it is easier to use a regexp than grepping
+macros from a source file, revert the ugly solution from commit
+2d941dc95a1d ('build: fix errors when building with gtk-doc 1.32').
+
+(cherry picked from commit 11cf082a6233a5c2f17da1b49457a66266062678)
+---
+ docs/libnm/Makefile.am | 4 +---
+ docs/libnm/meson.build | 5 +----
+ tools/decorators.sh    | 7 -------
+ 3 files changed, 2 insertions(+), 14 deletions(-)
+ delete mode 100755 tools/decorators.sh
+
+diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am
+index ded32f8218..20dc8de571 100644
+--- a/docs/libnm/Makefile.am
++++ b/docs/libnm/Makefile.am
+@@ -18,10 +18,8 @@ DOC_SOURCE_DIR= \
+       $(top_srcdir)/libnm \
        $(top_builddir)/libnm
  
+-decorators := $(shell $(top_srcdir)/tools/decorators.sh $(top_srcdir)/libnm-core/nm-version.h)
+-
  # Extra options to supply to gtkdoc-scan.
--SCAN_OPTIONS=--rebuild-types --rebuild-sections
-+SCAN_OPTIONS=--rebuild-types --rebuild-sections --ignore-decorators='NM_DEPRECATED_IN_1_2|NM_AVAILABLE_IN_1_2'
+-SCAN_OPTIONS=--rebuild-types --rebuild-sections --ignore-decorators "$(decorators)"
++SCAN_OPTIONS=--rebuild-types --rebuild-sections --ignore-decorators="NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?"
  
  # Extra options to supply to gtkdoc-mkdb.
  MKDB_OPTIONS=--sgml-mode --output-format=xml
+diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build
+index 3403b339d7..b4a23729bb 100644
+--- a/docs/libnm/meson.build
++++ b/docs/libnm/meson.build
+@@ -32,9 +32,6 @@ configure_file(
+   configuration: version_conf,
+ )
+ 
+-result = run_command(join_paths(meson.source_root(), 'tools', 'decorators.sh'),
+-                     join_paths(meson.source_root(), 'libnm-core', 'nm-version.h'))
+-
+ gnome.gtkdoc(
+   doc_module,
+   main_xml: doc_module + '-docs.xml',
+@@ -46,7 +43,7 @@ gnome.gtkdoc(
+   scan_args: [
+     '--rebuild-types',
+     '--rebuild-sections',
+-    '--ignore-decorators=' + result.stdout().strip(),
++    '--ignore-decorators=NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?',
+     '--ignore-headers=' + ' '.join(private_headers),
+   ],
+   scanobjs_args: '--type-init-func="g_type_init();"',
+-- 
+2.22.0
+

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 2a5b9f87e0b884713063b580451e8b6a397bda70..eb2f5da387fb7f2593912c9a294a811e12d8328d 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,13 +6,13 @@
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
-Version:       1.20.0
+Version:       1.20.2
 Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/%{name}-%{version}.tar.xz
-# Source0-md5: 109df9b0813755a98735206f5b2d68da
+# Source0-md5: 81d688e9d5d81ae9da37663c1d74d010
 Source1:       %{name}.conf
 Source3:       %{name}.tmpfiles
 Source4:       %{name}.init