From 925e3e159be1b3c8e4ca2e628d0adeb7a014a0ae Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 18 Feb 2021 20:12:25 +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#923d3d1d992a75c3437a5715c8925a5d37253af5
---
 .gitignore          |  1 +
 NetworkManager.spec | 13 ++++++-------
 sources             |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ae2c70..85b35e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -384,3 +384,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.29.9.tar.xz
 /NetworkManager-1.29.11.tar.xz
 /NetworkManager-1.29.90.tar.xz
+/NetworkManager-1.30.0.tar.xz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index feb5d8b..3638841 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,8 +6,8 @@
 
 %global epoch_version 1
 %global rpm_version 1.30.0
-%global real_version 1.29.90
-%global release_version 0.5
+%global real_version 1.30.0
+%global release_version 1
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -47,12 +47,8 @@
 %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
@@ -172,7 +168,7 @@ Version: %{rpm_version}
 Release: %{release_version}%{?snap}%{?dist}
 Group: System Environment/Base
 License: GPLv2+ and LGPLv2+
-URL: http://www.gnome.org/projects/NetworkManager/
+URL: https://networkmanager.dev/
 
 Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}.tar.xz
 Source1: NetworkManager.conf
@@ -1139,6 +1135,9 @@ fi
 
 
 %changelog
+* Thu Feb 18 2021 Thomas Haller <thaller@redhat.com> - 1:1.30.0-1
+- update to 1.30.0 release
+
 * Thu Feb 11 2021 Thomas Haller <thaller@redhat.com> - 1:1.30.0-0.5
 - update to 1.30-rc1 (1.29.90-dev) snapshot
 
diff --git a/sources b/sources
index 7c4cf5d..8a35a4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.29.90.tar.xz) = 018ff40fd517530c2e551b5de85075a534a70f966e84f5730ff3bd0790147e57759a08da53b9dc3c557e0ab223d0feaa4e0d8330c07be455cd3e33855f64447e
+SHA512 (NetworkManager-1.30.0.tar.xz) = e4ed1866af5fd06d4bc6cec65b0fc87b3301ff4cc7d791ac71a3b98036f811d961bb3743a7fd497ef7cbc3f6b3f6ffa1d91751afcd4e5f943179946dc8b8fc24