From 4c9e0650bdd5db803d1b2e2e7c7c53e3a5ffe9ea Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Fri, 20 Jun 2008 06:04:40 +0000 Subject: [PATCH] - fix displaying of 7zip archive contents (#452090) - gvlat@pochta.ru --- mc-7zip.patch | 23 +++++++++++++++++++++++ mc.spec | 7 ++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 mc-7zip.patch diff --git a/mc-7zip.patch b/mc-7zip.patch new file mode 100644 index 0000000..49c829a --- /dev/null +++ b/mc-7zip.patch @@ -0,0 +1,23 @@ +diff -ru mc-4.6.2-pre1/vfs/extfs/u7z mc-4.6.2-pre1_u7z/vfs/extfs/u7z +--- mc-4.6.2-pre1/vfs/extfs/u7z 2005-06-22 06:21:43.000000000 +0400 ++++ mc-4.6.2-pre1_u7z/vfs/extfs/u7z 2008-06-19 08:49:05.000000000 +0400 +@@ -47,8 +47,8 @@ + } + + # override any locale for dates +-LC_ALL=C +-export LC_ALL ++LC_DATE=C ++export LC_DATE + + umask 077 + +@@ -56,7 +56,7 @@ + shift + + case "$cmd" in +- list) mcu7zip_list "$@" ;; ++ list) mcu7zip_list "$@"|sort -k 8 ;; + copyout) mcu7zip_copyout "$@" ;; + copyin) mcu7zip_copyin "$@" ;; + mkdir) mcu7zip_mkdir "$@" ;; diff --git a/mc.spec b/mc.spec index 1db7bfb..401cfa0 100644 --- a/mc.spec +++ b/mc.spec @@ -1,7 +1,7 @@ Summary: User-friendly text console file manager and visual shell Name: mc Version: 4.6.2 -Release: 3.pre1%{?dist} +Release: 4.pre1%{?dist} Epoch: 1 License: GPLv2 Group: System Environment/Shells @@ -31,6 +31,7 @@ Patch16: mc-refresh.patch Patch17: mc-preserveattr.patch Patch18: mc-lzma.patch Patch19: mc-hintchk.patch +Patch20: mc-7zip.patch %description Midnight Commander is a visual shell much like a file manager, only @@ -61,6 +62,7 @@ specific files. %patch17 -p1 -b .preserveattr %patch18 -p1 -b .lzmavfs %patch19 -p1 -b .hintchk +%patch20 -p1 -b .7zip # convert files in /lib to UTF-8 pushd lib @@ -198,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/mc %changelog +* Fri Jun 20 2008 Jindrich Novy 4.6.2-4.pre1 +- fix displaying of 7zip archive contents (#452090) - gvlat@pochta.ru + * Thu Mar 27 2008 Jindrich Novy 4.6.2-3.pre1 - don't segfault when hint or help files are missing (#439025), thanks to Tomas Heinrich