diff --git a/file-roller-3.22.0.tar.xz b/file-roller-3.22.0.tar.xz deleted file mode 100644 index 239ef62..0000000 --- a/file-roller-3.22.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5065b71d43deb3dc3c7af6efa3f3b1188a63bfafb213be86af1d262b1dc11d42 -size 1433332 diff --git a/file-roller-3.22.1.tar.xz b/file-roller-3.22.1.tar.xz new file mode 100644 index 0000000..8ee6e22 --- /dev/null +++ b/file-roller-3.22.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8106791dcecbd2ab64194f4aeb5cb709a15e9e0d28e6470528c7bf56969be552 +size 1423712 diff --git a/file-roller-revertfix-fr_application_local.patch b/file-roller-revertfix-fr_application_local.patch deleted file mode 100644 index 400a79c..0000000 --- a/file-roller-revertfix-fr_application_local.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b78272c758a7f1835471e3804d1e9340e69bd2a3 Mon Sep 17 00:00:00 2001 -From: Paolo Bacchilega -Date: Thu, 15 Sep 2016 10:36:53 +0200 -Subject: 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 43e8e20..a2442d5 100644 ---- a/src/fr-application.c -+++ b/src/fr-application.c -@@ -644,19 +644,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); -@@ -669,6 +671,7 @@ fr_application_local_command_line (GApplication *application, - } - - g_option_context_free (context); -+ g_strfreev (local_argv); - - return handled_locally; - } --- -cgit v0.12 - diff --git a/file-roller.changes b/file-roller.changes index f8b02aa..49ac024 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Oct 10 17:24:41 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.22.1: + + Remove handling of Comic Books archives. Handle Source RPMs + (bgo#767244). + + fr-new-archive-dialog: Do not fail if access::can-write is not + set (bgo#688714). + + Fix crash when compressing remote files (bgo#767577). + + window: + - Use gdk_cursor_new_for_display() (bgo#767534). + - Set the paned as the drag destination (bgo#767621). + + Dialog title displayed untranslated (bgo#756917). + + Updated translations. +- Drop file-roller-revertfix-fr_application_local.patch: Fixed + upstream. + ------------------------------------------------------------------- Thu Sep 29 07:41:53 UTC 2016 - zaitor@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 707a8ef..f0d2700 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -17,7 +17,7 @@ Name: file-roller -Version: 3.22.0 +Version: 3.22.1 Release: 0 Summary: An Archive Manager for GNOME License: GPL-2.0+ @@ -28,8 +28,6 @@ Source: http://download.gnome.org/sources/file-roller/3.22/%{name}-%{ver Patch0: file-roller-3.4-change-archiver-priority.patch # PATCH-FEATURE-OPENSUSE file-roller-pkg-match.patch bnc#696530 dimstar@opensuse.org -- List package match names for automatic installation using PK. Patch1: file-roller-pkg-match.patch -# PATCH-FIX-UPSTREAM file-roller-revertfix-fr_application_local.patch bgo#772148 zaitor@opensuse.org -- Allow multiple windows of file-roller. -Patch2: file-roller-revertfix-fr_application_local.patch # Needed for directory ownership BuildRequires: dbus-1 BuildRequires: fdupes @@ -89,7 +87,6 @@ contained in the archive, and extract files from the archive. %setup -q %patch0 %patch1 -p1 -%patch2 -p1 %if !0%{?is_opensuse} translation-update-upstream %endif