From c72f3f9d73d16570f86bd3580b5620d6107e1767cefa4c3f62aecafa243604d4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 21 Jul 2012 15:12:19 +0000 Subject: [PATCH 1/2] Accepting request 128303 from home:Gankov:branches:GNOME:Factory Fix encoding of cyrillic filenames in zip, created under Windows (bnc#767386) OBS-URL: https://build.opensuse.org/request/show/128303 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=139 --- ...-roller-3.4-change-archiver-priority.patch | 20 +++++++++++++++++++ file-roller.changes | 6 ++++++ file-roller.spec | 3 +++ 3 files changed, 29 insertions(+) create mode 100644 file-roller-3.4-change-archiver-priority.patch diff --git a/file-roller-3.4-change-archiver-priority.patch b/file-roller-3.4-change-archiver-priority.patch new file mode 100644 index 0000000..0396772 --- /dev/null +++ b/file-roller-3.4-change-archiver-priority.patch @@ -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); + } diff --git a/file-roller.changes b/file-roller.changes index 24b175a..f295211 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jun 17 17:29:05 UTC 2012 - gankov@opensuse.org + +- Add file-roller-3.4-change-archiver-priority.patch : Fix encoding + of cyrillic filenames in zip, created under Windows (bnc#767386) + ------------------------------------------------------------------- Mon May 14 20:41:44 UTC 2012 - vuntz@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 1a74708..51c73b0 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -24,6 +24,8 @@ License: GPL-2.0+ Group: Productivity/Archiving/Compression Url: http://fileroller.sourceforge.net 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] +Patch0: file-roller-3.4-change-archiver-priority.patch # Needed for directory ownership BuildRequires: dbus-1 BuildRequires: fdupes @@ -89,6 +91,7 @@ This package contains a plugin to integrate File Roller into Nautilus. %lang_package %prep %setup -q +%patch0 translation-update-upstream %build From 8a73d68fe750f731afd9cddd5543acca3eac32c83692807dae8628d4c4048405 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 21 Jul 2012 15:18:32 +0000 Subject: [PATCH 2/2] Accepting request 128575 from home:dimstar:branches: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 OBS-URL: https://build.opensuse.org/request/show/128575 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=140 --- file-roller.changes | 8 ++++++-- file-roller.spec | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/file-roller.changes b/file-roller.changes index f295211..14f15e1 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,8 +1,12 @@ ------------------------------------------------------------------- Sun Jun 17 17:29:05 UTC 2012 - gankov@opensuse.org -- Add file-roller-3.4-change-archiver-priority.patch : Fix encoding - of cyrillic filenames in zip, created under Windows (bnc#767386) +- 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 diff --git a/file-roller.spec b/file-roller.spec index 51c73b0..ca9bf26 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -24,7 +24,7 @@ License: GPL-2.0+ Group: Productivity/Archiving/Compression Url: http://fileroller.sourceforge.net 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] +# 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 BuildRequires: dbus-1