Update to 1.8.14 release

.gitignore

@@ -41,3 +41,4 @@
 /network-manager-applet-1.8.8.tar.xz
 /network-manager-applet-1.8.10.tar.xz
 /network-manager-applet-1.8.12.tar.xz
+/network-manager-applet-1.8.14.tar.xz

0001-Handle-keep-above-passed-through-to-editor_command_l.patch

@@ -1,49 +0,0 @@
-From 19a00beed249cb5f261ff235781b961f4d3b5d1c Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Fri, 1 Jun 2018 16:20:34 -0700
-Subject: [PATCH] Handle --keep-above passed through to editor_command_line
-
-Handling of nm-connection-editor command line arguments was
-changed in f3782da2. Since that commit, most args are handled
-by `editor_command_line`, but one (`--keep-above`) is handled
-by `main`. Unfortunately, if `--keep-above` appears with other
-arguments, `main` does not strip it from argv and parsing in
-`editor_command_line` fails with "Failed to parse options".
-
-To handle this, let's just have `editor_command_line` recognize
-but ignore `--keep-above` if it encounters it.
-
-https://gitlab.gnome.org/GNOME/network-manager-applet/issues/1
-
-Signed-off-by: Adam Williamson <awilliam@redhat.com>
----
- src/connection-editor/main.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/connection-editor/main.c b/src/connection-editor/main.c
-index 29facda9..92fdbda7 100644
---- a/src/connection-editor/main.c
-+++ b/src/connection-editor/main.c
-@@ -224,7 +224,7 @@ editor_command_line (GApplication *application,
- 	GOptionContext *opt_ctx = NULL;
- 	GError *error = NULL;
- 	gs_free char *type = NULL, *uuid = NULL, *import = NULL;
--	gboolean create = FALSE, show = FALSE;
-+	gboolean create = FALSE, show = FALSE, keepabove = FALSE;
- 	int ret = 1;
- 	GOptionEntry entries[] = {
- 		{ "type",   't', 0, G_OPTION_ARG_STRING, &type,   "Type of connection to show or create", NM_SETTING_WIRED_SETTING_NAME },
-@@ -232,6 +232,10 @@ editor_command_line (GApplication *application,
- 		{ "show",   's', 0, G_OPTION_ARG_NONE,   &show,   "Show a given connection type page", NULL },
- 		{ "edit",   'e', 0, G_OPTION_ARG_STRING, &uuid,   "Edit an existing connection with a given UUID", "UUID" },
- 		{ "import", 'i', 0, G_OPTION_ARG_STRING, &import, "Import a VPN connection from given file", NULL },
-+		/* handled in main but may be passed through here, so we need
-+		 * to parse and ignore it
-+		 */
-+		{ "keep-above", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &keepabove, NULL, NULL },
- 		{ NULL }
- 	};
- 
--- 
-2.17.0
-

0002-fix-double-free-rh1585302.patch

@@ -1,30 +0,0 @@
-From 2c3ad506c6607cef922b97919b6250a1243cc57e Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 29 May 2018 22:05:07 +0200
-Subject: [PATCH 1/1] NMNetworkMenuItem: Don't double-free priv->dupes
-
-https://bugs.archlinux.org/task/58767
-
-https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/2
-
-Fixes: 15ac92e6a42317e86ffb6d52a9ce5cacbf9e8c87
-(cherry picked from commit 40a6dd2f22c32ec668287d019ef6667c297d17ec)
----
- src/ap-menu-item.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/ap-menu-item.c b/src/ap-menu-item.c
-index 92953c04..7d614f45 100644
---- a/src/ap-menu-item.c
-+++ b/src/ap-menu-item.c
-@@ -327,7 +327,6 @@ finalize (GObject *object)
- 	g_free (priv->ssid_string);
- 
- 	g_slist_free_full (priv->dupes, g_free);
--	g_slist_free (priv->dupes);
- 
- 	G_OBJECT_CLASS (nm_network_menu_item_parent_class)->finalize (object);
- }
--- 
-2.17.0
-

network-manager-applet.spec

@@ -3,9 +3,9 @@
 %global nm_version      1:1.1.0
 %global obsoletes_ver   1:0.9.7
 
-%global rpm_version 1.8.12
+%global rpm_version 1.8.14
-%global real_version 1.8.12
+%global real_version 1.8.14
-%global release_version 4
+%global release_version 1
 
 %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
 
@@ -26,10 +26,6 @@ Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
 
 Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz
 Patch1: 0001-nm-applet-no-notifications.patch
-# https://gitlab.gnome.org/GNOME/network-manager-applet/issues/1
-# https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/3
-Patch2: 0001-Handle-keep-above-passed-through-to-editor_command_l.patch
-Patch3: 0002-fix-double-free-rh1585302.patch
 
 Requires: NetworkManager >= %{nm_version}
 Requires: libnotify >= 0.4.3
@@ -128,8 +124,6 @@ This package deprecates libnm-gtk.
 %prep
 %setup -q -n "%{name}-%{real_version}"
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %meson \
@@ -190,7 +184,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 %{_datadir}/icons/hicolor/*/apps/nm-no-connection.*
 %{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png
 %{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
-%{_datadir}/appdata/nm-connection-editor.appdata.xml
+%{_datadir}/metainfo/nm-connection-editor.appdata.xml
 %{_mandir}/man1/nm-connection-editor*
 %dir %{_datadir}/gnome-vpn-properties
 
@@ -223,6 +217,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 
 
 %changelog
+* Mon Jun 25 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.8.14-1
+- Update to 1.8.14 release
+
 * Mon Jun  4 2018 Thomas Haller <thaller@redhat.com> - 1.8.12-4
 - applet: fix double-free in ap-menu-item (rh #1585302)
 

sources

@@ -1 +1 @@
-SHA512 (network-manager-applet-1.8.12.tar.xz) = 1d4c180c5cad3d0f9113b6b5b92a53410c6b625a39546b431b13110be9cd3a65bd542ba91ff384167a2247574c29f73253334c70a7f997d69ae10e1cf8b6aae9
+SHA512 (network-manager-applet-1.8.14.tar.xz) = e446a2e90faf17e672fa79a53280957dfd9a7a022293dfd578b4ebb71e821c2f387f8ec821c2dcd9a24d1e00e0bd32a4ac3c5d802b9a4fdd7f876c870f406eea