From e4027e3b1a328c4a032645215539341424feef74 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 17 Dec 2019 11:11:14 +0100
Subject: [PATCH] Update to 1.22.0

---
 .gitignore          |  1 +
 NetworkManager.spec | 19 +++++++++++++++++--
 sources             |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6b84a0f..5697656 100644
--- a/.gitignore
+++ b/.gitignore
@@ -364,3 +364,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.20.4.tar.xz
 /NetworkManager-1.21.3.tar.xz
 /NetworkManager-1.21.90.tar.xz
+/NetworkManager-1.22.0.tar.xz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index aebfa13..490005c 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,8 +6,8 @@
 
 %global epoch_version 1
 %global rpm_version 1.22.0
-%global real_version 1.21.90
-%global release_version 0.2
+%global real_version 1.22.0
+%global release_version 1
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -484,6 +484,7 @@ Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
 %description cloud-setup
 Installs a nm-cloud-setup tool that can automatically configure
 NetworkManager in cloud setups. Currently only EC2 is supported.
+This tool is still experimental.
 %endif
 
 
@@ -541,6 +542,11 @@ NetworkManager in cloud setups. Currently only EC2 is supported.
 %else
 	-Diwd=false \
 %endif
+%if %{with bluetooth}
+	-Dbluez5_dun=true \
+%else
+	-Dbluez5_dun=false \
+%endif
 %if %{with nmtui}
 	-Dnmtui=true \
 %else
@@ -570,6 +576,7 @@ NetworkManager in cloud setups. Currently only EC2 is supported.
 %endif
 	-Dselinux=true \
 	-Dpolkit=true  \
+	-Dconfig_auth_polkit_default=true \
 	-Dpolkit_agent=true \
 	-Dmodify_system=true \
 	-Dconcheck=true \
@@ -667,6 +674,11 @@ intltoolize --automake --copy --force
 %else
 	--with-iwd=no \
 %endif
+%if %{with bluetooth}
+	--enable-bluez5-dun=yes \
+%else
+	--enable-bluez5-dun=no \
+%endif
 %if %{with nmtui}
 	--with-nmtui=yes \
 %else
@@ -1041,6 +1053,9 @@ fi
 
 
 %changelog
+* Tue Dec 17 2019 Thomas Haller <thaller@redhat.com> - 1:1.22.0-1
+- Update to 1.22.0
+
 * Fri Nov 29 2019 Thomas Haller <thaller@redhat.com> - 1:1.21.0-0.2
 - Update to 1.21.90 (1.22-rc1)
 
diff --git a/sources b/sources
index 7e22b8c..db0a7a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.21.90.tar.xz) = 487450a874b5d7046118a09f221e641fadeb8782bf7b537181a93d74d5edf84e8b62162a9459a6f8148408351bb1d7e8d00e22099da3eb5b2d5b0d658a8ad0c5
+SHA512 (NetworkManager-1.22.0.tar.xz) = f6a2f621b42f7788646c81cc61d17261aa6df6351e6acfbc70d3d1b034416476f1c14b2444565d6abac2ee1b9aa2680fdb513b523fe6cad1bc37102d4bee41d0