From 52f508ea02c20f81fc41e6b594580842a823f4003e734b539621201cf7d0a05f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 18 Apr 2019 12:29:55 +0000 Subject: [PATCH] Accepting request 695655 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/695655 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=276 --- file-roller-3.30.1.tar.xz | 3 - file-roller-3.32.1.tar.xz | 3 + ...-roller-3.4-change-archiver-priority.patch | 32 +++++------ file-roller-ignore-unrar-if-wrapper.patch | 10 ++-- file-roller-pkg-match.patch | 8 +-- file-roller.changes | 56 +++++++++++++++++++ file-roller.spec | 11 ++-- 7 files changed, 91 insertions(+), 32 deletions(-) delete mode 100644 file-roller-3.30.1.tar.xz create mode 100644 file-roller-3.32.1.tar.xz diff --git a/file-roller-3.30.1.tar.xz b/file-roller-3.30.1.tar.xz deleted file mode 100644 index fee5274..0000000 --- a/file-roller-3.30.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41de44cb85607511cc7bbc9496ba241e714b180e671d724ae8be478ff553394e -size 1443340 diff --git a/file-roller-3.32.1.tar.xz b/file-roller-3.32.1.tar.xz new file mode 100644 index 0000000..2bacc6f --- /dev/null +++ b/file-roller-3.32.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cab0847845b3236725a99f81a638c504d06ac0576c7a947824208e498383547 +size 849996 diff --git a/file-roller-3.4-change-archiver-priority.patch b/file-roller-3.4-change-archiver-priority.patch index 974f7d1..efd6997 100644 --- a/file-roller-3.4-change-archiver-priority.patch +++ b/file-roller-3.4-change-archiver-priority.patch @@ -1,20 +1,20 @@ -Index: file-roller-3.29.91/src/fr-init.c +Index: file-roller-3.31.92/src/fr-init.c =================================================================== ---- file-roller-3.29.91.orig/src/fr-init.c 2018-08-27 20:37:42.000000000 +0200 -+++ file-roller-3.29.91/src/fr-init.c 2018-08-29 01:05:09.851754510 +0200 -@@ -368,6 +368,7 @@ register_archives (void) +--- file-roller-3.31.92.orig/src/fr-init.c ++++ file-roller-3.31.92/src/fr-init.c +@@ -374,6 +374,7 @@ register_archives (void) - register_archive (FR_TYPE_COMMAND_TAR); - register_archive (FR_TYPE_COMMAND_CFILE); -+ register_archive (FR_TYPE_COMMAND_ZIP); - register_archive (FR_TYPE_COMMAND_7Z); - register_archive (FR_TYPE_COMMAND_DPKG); + register_archive (fr_command_tar_get_type ()); + register_archive (fr_command_cfile_get_type ()); ++ register_archive (fr_command_zip_get_type ()); + register_archive (fr_command_7z_get_type ()); + register_archive (fr_command_dpkg_get_type ()); -@@ -383,7 +384,6 @@ register_archives (void) - register_archive (FR_TYPE_COMMAND_RPM); - register_archive (FR_TYPE_COMMAND_UNSQUASHFS); - register_archive (FR_TYPE_COMMAND_UNSTUFF); -- register_archive (FR_TYPE_COMMAND_ZIP); - register_archive (FR_TYPE_COMMAND_LRZIP); - register_archive (FR_TYPE_COMMAND_ZOO); +@@ -389,7 +390,6 @@ register_archives (void) + register_archive (fr_command_rpm_get_type ()); + register_archive (fr_command_unsquashfs_get_type ()); + register_archive (fr_command_unstuff_get_type ()); +- register_archive (fr_command_zip_get_type ()); + register_archive (fr_command_lrzip_get_type ()); + register_archive (fr_command_zoo_get_type ()); #if HAVE_JSON_GLIB diff --git a/file-roller-ignore-unrar-if-wrapper.patch b/file-roller-ignore-unrar-if-wrapper.patch index d011f9e..e1b437c 100644 --- a/file-roller-ignore-unrar-if-wrapper.patch +++ b/file-roller-ignore-unrar-if-wrapper.patch @@ -1,8 +1,8 @@ -Index: file-roller-3.29.91/src/fr-command-rar.c +Index: file-roller-3.32.0/src/fr-command-rar.c =================================================================== ---- file-roller-3.29.91.orig/src/fr-command-rar.c 2018-08-27 20:37:42.000000000 +0200 -+++ file-roller-3.29.91/src/fr-command-rar.c 2018-08-29 01:05:09.879754204 +0200 -@@ -763,6 +763,39 @@ fr_command_rar_get_mime_types (FrArchive +--- file-roller-3.32.0.orig/src/fr-command-rar.c 2019-03-11 23:00:45.000000000 +0100 ++++ file-roller-3.32.0/src/fr-command-rar.c 2019-03-14 20:21:40.103871799 +0100 +@@ -775,6 +775,39 @@ fr_command_rar_get_mime_types (FrArchive return rar_mime_type; } @@ -42,7 +42,7 @@ Index: file-roller-3.29.91/src/fr-command-rar.c static FrArchiveCap fr_command_rar_get_capabilities (FrArchive *archive, -@@ -774,7 +807,7 @@ fr_command_rar_get_capabilities (FrArchi +@@ -786,7 +819,7 @@ fr_command_rar_get_capabilities (FrArchi capabilities = FR_ARCHIVE_CAN_STORE_MANY_FILES | FR_ARCHIVE_CAN_ENCRYPT | FR_ARCHIVE_CAN_ENCRYPT_HEADER; if (_g_program_is_available ("rar", check_command)) capabilities |= FR_ARCHIVE_CAN_READ_WRITE | FR_ARCHIVE_CAN_CREATE_VOLUMES; diff --git a/file-roller-pkg-match.patch b/file-roller-pkg-match.patch index 6ea9e2b..db2491c 100644 --- a/file-roller-pkg-match.patch +++ b/file-roller-pkg-match.patch @@ -1,8 +1,8 @@ -Index: file-roller-3.29.91/data/packages.match +Index: file-roller-3.32.0/data/packages.match =================================================================== ---- file-roller-3.29.91.orig/data/packages.match 2018-08-27 20:37:41.000000000 +0200 -+++ file-roller-3.29.91/data/packages.match 2018-08-29 01:05:09.863754379 +0200 -@@ -6,15 +6,15 @@ cpio= +--- file-roller-3.32.0.orig/data/packages.match 2019-03-11 23:00:44.000000000 +0100 ++++ file-roller-3.32.0/data/packages.match 2019-03-14 20:21:39.939870131 +0100 +@@ -7,15 +7,15 @@ cpio= dpkg= genisoimage= gzip= diff --git a/file-roller.changes b/file-roller.changes index ffe1efc..cae8a4e 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Wed Apr 10 08:44:51 UTC 2019 - Bjørn Lie + +- Update to version 3.32.1: + + Updated translations. + +------------------------------------------------------------------- +Thu Mar 14 18:59:05 UTC 2019 - Bjørn Lie + +- Update to version 3.32.0: + + Updated translations. +- Rebase patches with refresh_patches service. + +------------------------------------------------------------------- +Tue Mar 12 07:17:26 UTC 2019 - Dominique Leuenberger + +- Rebase file-roller-3.4-change-archiver-priority.patch + (boo#1128813). + +------------------------------------------------------------------- +Tue Mar 5 05:56:07 UTC 2019 - Bjørn Lie + +- Update to version 3.31.92: + + Updated translations. + +------------------------------------------------------------------- +Mon Feb 18 22:53:56 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 3.31.91: + + Updated translations. + +------------------------------------------------------------------- +Fri Feb 15 21:23:23 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 3.31.90: + + Updated translations. + +------------------------------------------------------------------- +Tue Jan 8 04:44:06 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 3.31.2: + + Improved app icon. + + Overwrite dialog: added button to skip all existing files when + extracting. + + Use G_DECLARE_TYPE boilerplate. + + Updated translations. +- Disable file-roller-3.4-change-archiver-priority.patch: Needs + rebase. + +------------------------------------------------------------------- +Thu Jan 3 21:24:44 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 3.31.1: + + Removed the application menu. + + Updated application icon. + ------------------------------------------------------------------- Wed Sep 26 17:11:09 UTC 2018 - bjorn.lie@gmail.com diff --git a/file-roller.spec b/file-roller.spec index 679c171..0dff4e9 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,7 +1,7 @@ # # spec file for package file-roller # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: file-roller -Version: 3.30.1 +Version: 3.32.1 Release: 0 Summary: An Archive Manager for GNOME License: GPL-2.0-or-later Group: Productivity/Archiving/Compression URL: https://wiki.gnome.org/Apps/FileRoller -Source0: https://download.gnome.org/sources/file-roller/3.30/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/file-roller/3.32/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE file-roller-3.4-change-archiver-priority.patch bnc#767386 gankov@opensuse.org -- Give unzip a higher priority than 7z when unpackging zip files. Gives better results for non-latin charsets. Patch0: file-roller-3.4-change-archiver-priority.patch @@ -83,7 +83,10 @@ contained in the archive, and extract files from the archive. %lang_package %prep -%autosetup -p1 +%autosetup -N +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 translation-update-upstream po %{name} %build