From 931fefc507bf779ccab509a36ad53f32a00d21b2 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 14 Jan 2021 22:45:40 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/NetworkManager.git#7a48b336075f4ea0fcf56166ed9665d349559467
---
 .gitignore          |  1 +
 NetworkManager.conf |  2 +-
 NetworkManager.spec | 43 ++++++++++++++++++++++++++++++++++++++-----
 sources             |  2 +-
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a8eb6f..55fa3e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -380,3 +380,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.27.90.tar.xz
 /NetworkManager-1.27.91.tar.xz
 /NetworkManager-1.28.0.tar.xz
+/NetworkManager-1.29.8.tar.xz
diff --git a/NetworkManager.conf b/NetworkManager.conf
index 6ee4797..b362fd0 100644
--- a/NetworkManager.conf
+++ b/NetworkManager.conf
@@ -22,7 +22,7 @@
 # the previous one.
 
 [main]
-#plugins=ifcfg-rh
+#plugins=keyfile,ifcfg-rh
 
 
 [logging]
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 7c04933..ed9d2bd 100644
--- a/NetworkManager.spec
+++ b/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.28.0
-%global real_version 1.28.0
-%global release_version 2
+%global rpm_version 1.30.0
+%global real_version 1.29.8
+%global release_version 0.1
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -38,6 +38,22 @@
 
 ###############################################################################
 
+%if "x__BCOND_DEFAULT_DEBUG__" == "x1" || "x__BCOND_DEFAULT_DEBUG__" == "x0"
+%global bcond_default_debug __BCOND_DEFAULT_DEBUG__
+%else
+%global bcond_default_debug 0
+%endif
+
+%if "x__BCOND_DEFAULT_TEST__" == "x1" || "x__BCOND_DEFAULT_TEST__" == "x0"
+%global bcond_default_test __BCOND_DEFAULT_TEST__
+%else
+%if 0%{?rhel} >= 9
+%global bcond_default_test 1
+%else
+%global bcond_default_test 0
+%endif
+%endif
+
 %bcond_with meson
 %bcond_without adsl
 %bcond_without bluetooth
@@ -49,8 +65,16 @@
 %bcond_without nmtui
 %bcond_without nm_cloud_setup
 %bcond_without regen_docs
+%if %{bcond_default_debug}
+%bcond_without debug
+%else
 %bcond_with    debug
+%endif
+%if %{bcond_default_test}
+%bcond_without test
+%else
 %bcond_with    test
+%endif
 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
 %bcond_without lto
 %else
@@ -184,6 +208,7 @@ Conflicts: NetworkManager-pptp < 1:0.7.0.99-1
 Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1
 Conflicts: kde-plasma-networkmanagement < 1:0.9-0.49.20110527git.nm09
 
+BuildRequires: make
 BuildRequires: gcc
 BuildRequires: libtool
 BuildRequires: pkgconfig
@@ -855,8 +880,12 @@ fi
 
 
 %post
-/usr/bin/udevadm control --reload-rules || :
-/usr/bin/udevadm trigger --subsystem-match=net || :
+# skip triggering if udevd isn't even accessible, e.g. containers or
+# rpm-ostree-based systems
+if [ -S /run/udev/control ]; then
+    /usr/bin/udevadm control --reload-rules || :
+    /usr/bin/udevadm trigger --subsystem-match=net || :
+fi
 %if %{with firewalld_zone}
 %firewalld_reload
 %endif
@@ -1098,10 +1127,14 @@ fi
 %{systemd_dir}/nm-cloud-setup.timer
 %{nmlibdir}/dispatcher.d/90-nm-cloud-setup.sh
 %{nmlibdir}/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh
+%{_mandir}/man8/nm-cloud-setup.8*
 %endif
 
 
 %changelog
+* Thu Jan 14 2021 Thomas Haller <thaller@redhat.com> - 1:1.30.0-0.1
+- update to 1.29.8-dev snapshot
+
 * Wed Jan 06 2021 Mohan Boddu <mboddu@bhujji.com> - 1:1.28.0-2
 - Rebuild for ppp-2.4.9-1
 
diff --git a/sources b/sources
index 10a8e28..b42f36c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.28.0.tar.xz) = ab0bc39626dc55df4e122ad6e1a8086e1467f44bdd41c4491c752dca3ffb549796e0ac888041f12f661f2f6cf4142d0fce59b5135549e48a0076fafcdc45ca06
+SHA512 (NetworkManager-1.29.8.tar.xz) = 23ae5a25eea634f374a6509d36457dea4d3b6c5a4db85949e750d9ec01ce517310f5f9459d5515552492fb92754995de52d77ce9742619658885439c5ca9ed2c