Update to 3.22.1

0001-Revert-Fix-fr_application_local_command_line-memory-.patch

@@ -1,60 +0,0 @@
-From 75c8032b4fd0cd347437422bb80cbe9b6a89de71 Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac@src.gnome.org>
-Date: Thu, 15 Sep 2016 10:36:53 +0200
-Subject: [PATCH] Revert "Fix fr_application_local_command_line memory leak"
-
-This reverts commit 1139c1a6bc1707fdb64e8baa824d19b83c4ff835.
-
-The commit introduce a bug that prevent opening other archives
-when a file-roller window is already open.
-
-Steps to reproduce the bug:
-
-* open a Nautilus window
-* click on an archive -> file-roller shows the archive content correctly
-* click on another archive (without closing the first file-roller window) -> the new file-roller window is
-empty
----
- src/fr-application.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/fr-application.c b/src/fr-application.c
-index 92e2fc9..06d86a1 100644
---- a/src/fr-application.c
-+++ b/src/fr-application.c
-@@ -641,19 +641,21 @@ fr_application_local_command_line (GApplication   *application,
-                                    char         ***arguments,
-                                    int            *exit_status)
- {
-+        char           **local_argv;
-         int              local_argc;
-         GOptionContext  *context;
-         GError          *error = NULL;
-         gboolean         handled_locally = FALSE;
- 
--        local_argc = g_strv_length (*arguments);
-+        local_argv = g_strdupv (*arguments);
-+        local_argc = g_strv_length (local_argv);
- 
--        program_argv0 = *arguments[0];
-+        program_argv0 = local_argv[0];
-         *exit_status = 0;
- 
-         context = fr_application_create_option_context ();
-         g_option_context_set_ignore_unknown_options (context, TRUE);
--	if (! g_option_context_parse (context, &local_argc, arguments, &error)) {
-+	if (! g_option_context_parse (context, &local_argc, &local_argv, &error)) {
- 		*exit_status = EXIT_FAILURE;
- 		g_critical ("Failed to parse arguments: %s", error->message);
-                 g_clear_error (&error);
-@@ -666,6 +668,7 @@ fr_application_local_command_line (GApplication   *application,
- 	}
- 
- 	g_option_context_free (context);
-+        g_strfreev (local_argv);
- 
-         return handled_locally;
- }
--- 
-2.7.4
-

file-roller.spec

@@ -1,5 +1,5 @@
 Name:           file-roller
-Version:        3.22.0
+Version:        3.22.1
 Release:        1%{?dist}
 Summary:        Tool for viewing and creating archives
 
@@ -10,8 +10,6 @@ Source0:        https://download.gnome.org/sources/%{name}/3.22/%{name}-%{versio
 # Use the X11 backend instead of Wayland
 # https://bugzilla.gnome.org/show_bug.cgi?id=770333
 Patch0:         Use-the-X11-backend-instead-of-Wayland.patch
-# Backported from upstream
-Patch1:         0001-Revert-Fix-fr_application_local_command_line-memory-.patch
 
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
@@ -39,7 +37,6 @@ such as tar or zip files.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure                                      \
@@ -87,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/GConf/gsettings/file-roller.convert
 
 %changelog
+* Wed Oct 12 2016 Kalev Lember <klember@redhat.com> - 3.22.1-1
+- Update to 3.22.1
+
 * Mon Sep 19 2016 Kalev Lember <klember@redhat.com> - 3.22.0-1
 - Update to 3.22.0
 

sources

@@ -1 +1 @@
-8e666f1191f3ebfdf63c578d1f9597e9  file-roller-3.22.0.tar.xz
+e50e7f0e6e0458f7d20288a7d76f02b6  file-roller-3.22.1.tar.xz