Accepting request 128576 from GNOME:Factory

Favor zip over 7z in order to have better visible results on non-latin charsets (e.g. Cyrillic). Fixes bnc#767386. Should enter 12.2 (forwarded request 128575 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/128576
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file-roller?expand=0&rev=84
This commit is contained in:
Stephan Kulow 2012-07-22 13:09:47 +00:00 committed by Git OBS Bridge
commit ebb6158c11
3 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,20 @@
Index: src/fr-init.c
===================================================================
--- src/fr-init.c.orig
+++ src/fr-init.c
@@ -339,6 +339,7 @@ register_commands (void)
register_command (FR_TYPE_COMMAND_TAR);
register_command (FR_TYPE_COMMAND_CFILE);
+ register_command (FR_TYPE_COMMAND_ZIP);
register_command (FR_TYPE_COMMAND_7Z);
register_command (FR_TYPE_COMMAND_DPKG);
@@ -353,7 +354,6 @@ register_commands (void)
register_command (FR_TYPE_COMMAND_RAR);
register_command (FR_TYPE_COMMAND_RPM);
register_command (FR_TYPE_COMMAND_UNSTUFF);
- register_command (FR_TYPE_COMMAND_ZIP);
register_command (FR_TYPE_COMMAND_LRZIP);
register_command (FR_TYPE_COMMAND_ZOO);
}

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sun Jun 17 17:29:05 UTC 2012 - gankov@opensuse.org
- Add file-roller-3.4-change-archiver-priority.patch : Give 'unzip'
a higher priority than '7z' when choosing the packer/unpacker
tool. Even though 7z would have slight better compression, unzip
has better results with non-latin character sets (due to added
librcc support in openSUSE). We favor having a better visible
user experience to slight better compression ratios (bnc#767386).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 14 20:41:44 UTC 2012 - vuntz@opensuse.org Mon May 14 20:41:44 UTC 2012 - vuntz@opensuse.org

View File

@ -24,6 +24,8 @@ License: GPL-2.0+
Group: Productivity/Archiving/Compression Group: Productivity/Archiving/Compression
Url: http://fileroller.sourceforge.net Url: http://fileroller.sourceforge.net
Source: http://download.gnome.org/sources/file-roller/3.4/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/file-roller/3.4/%{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
# Needed for directory ownership # Needed for directory ownership
BuildRequires: dbus-1 BuildRequires: dbus-1
BuildRequires: fdupes BuildRequires: fdupes
@ -89,6 +91,7 @@ This package contains a plugin to integrate File Roller into Nautilus.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch0
translation-update-upstream translation-update-upstream
%build %build