From ac21445f512c2f4d805b4265ff262558c3374585 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 30 Sep 2019 09:09:59 +0200
Subject: [PATCH] Update to 1.20.4 release

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

diff --git a/.gitignore b/.gitignore
index dfcbdb3..22911ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -361,3 +361,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.19.90.tar.xz
 /NetworkManager-1.20.0.tar.xz
 /NetworkManager-1.20.2.tar.xz
+/NetworkManager-1.20.4.tar.xz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 4523c54..8baced9 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -1,15 +1,13 @@
 
-%global wireless_tools_version 1:28-0pre9
-
 %global wpa_supplicant_version 1:1.1
 
 %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
 %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
 
 %global epoch_version 1
-%global rpm_version 1.20.2
-%global real_version 1.20.2
-%global release_version 3
+%global rpm_version 1.20.4
+%global real_version 1.20.4
+%global release_version 1
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -174,9 +172,6 @@ BuildRequires: intltool
 BuildRequires: gettext-devel
 
 BuildRequires: dbus-devel >= %{dbus_version}
-%if 0%{?fedora}
-BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
-%endif
 BuildRequires: glib2-devel >= 2.40.0
 BuildRequires: gobject-introspection-devel >= 0.10.3
 %if %{with ppp}
@@ -977,6 +972,12 @@ fi
 
 
 %changelog
+* Mon Sep 30 2019 Thomas Haller <thaller@redhat.com> - 1:1.20.4-1
+- Update to 1.20.4 release
+- wifi: fix crash related to Wi-Fi P2P
+- initrd: handle rd.znet parameter for s390 (rh #1753975)
+- core: don't generate default-wired-connection if profile exists (rh #1727909)
+
 * Sat Sep 07 2019 Lubomir Rintel <lkundrak@v3.sk> - 1:1.20.2-3
 - Actually fix the boolean dep for the wireless daemon
 
diff --git a/sources b/sources
index e9abd51..4201006 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.20.2.tar.xz) = 5070af29e2a6db0d58b0b1233f8fd40aca0eca68b879daaa416d7cd7b882741cc9f4746e295bdf99eb63798225bc259321cac994f050a08a00dc1c59170a16fe
+SHA512 (NetworkManager-1.20.4.tar.xz) = d08f7e8f5ea8f8567834a53a68ff7aeff09839658b73dc17b31dbdd7dd5c36b09f4e563c2ebc52d1e1574a84163e66e0bfee01c3762a222aa7154d18c09660cb