From da0c931f465dd2bc698e33652dc5b5dd4e4469e4 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 6 Aug 2019 13:58:08 +0200
Subject: [PATCH] Update to 1.20.0 release

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

diff --git a/.gitignore b/.gitignore
index 1f267d5..e9039f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -359,3 +359,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.19.3.tar.xz
 /NetworkManager-1.19.5.tar.xz
 /NetworkManager-1.19.90.tar.xz
+/NetworkManager-1.20.0.tar.xz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 1a69eb3..892f13a 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -8,8 +8,8 @@
 
 %global epoch_version 1
 %global rpm_version 1.20.0
-%global real_version 1.19.90
-%global release_version 0.5
+%global real_version 1.20.0
+%global release_version 1
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -120,7 +120,7 @@ Epoch: %{epoch_version}
 Version: %{rpm_version}
 Release: %{release_version}%{?snap}%{?dist}
 Group: System Environment/Base
-License: GPLv2+
+License: GPLv2+ and LGPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
 Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}.tar.xz
@@ -377,6 +377,7 @@ This package contains NetworkManager support for PPP.
 Summary: Libraries for adding NetworkManager support to applications (new API).
 Group: Development/Libraries
 Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release}
+License: LGPLv2+
 
 %description libnm
 This package contains the libraries that make it easier to use some
@@ -390,6 +391,7 @@ Group: Development/Libraries
 Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: glib2-devel
 Requires: pkgconfig
+License: LGPLv2+
 
 %description libnm-devel
 This package contains the header and pkg-config files for development
@@ -966,6 +968,9 @@ fi
 
 
 %changelog
+* Tue Aug  6 2019 Thomas Haller <thaller@redhat.com> - 1:1.20.0-1
+- Update to 1.20.0 release
+
 * Mon Jul 29 2019 Thomas Haller <thaller@redhat.com> - 1:1.20.0-0.5
 - Update to 1.20-rc1 upstream release candidate
 
diff --git a/sources b/sources
index 2e939df..2dc7288 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.19.90.tar.xz) = fe74daaeb51a42809620b986e238bb3823897e535890ffeb11b570dc4e357a38db03182a5efd817608eaebf2d7ae95ae95d0ddfc9a86b8a70ef44aef6e9e3c65
+SHA512 (NetworkManager-1.20.0.tar.xz) = 825c56a7530d813ba7ea2ec57034def560f4b0fb65a09dc70cd94dc897e2aabde11f18c6c4843da9c520531683e963037ce42270a6ffa5c7c5e9502bb80bdf1b