diff --git a/mc-4.8.25.sha256 b/mc-4.8.25.sha256 deleted file mode 100644 index 7fa4d52..0000000 --- a/mc-4.8.25.sha256 +++ /dev/null @@ -1,2 +0,0 @@ -407dc20f70082f26c7f5716406cb755cbb6cba3f2f13b841b79a991282d310c2 mc-4.8.25.tar.bz2 -ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a mc-4.8.25.tar.xz diff --git a/mc-4.8.25.tar.xz b/mc-4.8.25.tar.xz deleted file mode 100644 index 4bef970..0000000 --- a/mc-4.8.25.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a -size 2488324 diff --git a/mc-4.8.26.sha256 b/mc-4.8.26.sha256 new file mode 100644 index 0000000..744151c --- /dev/null +++ b/mc-4.8.26.sha256 @@ -0,0 +1,3 @@ +f4fad25a0e7a451ed906b76846efd6d2699a65b40795b29553addc35bf9a75c8 mc-4.8.25-155-ga88a626e7.tar.bz2 +9d6358d0a351a455a1410aab57f33b6b48b0fcf31344b9a10b0ff497595979d1 mc-4.8.26.tar.bz2 +c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27 mc-4.8.26.tar.xz diff --git a/mc-4.8.26.tar.xz b/mc-4.8.26.tar.xz new file mode 100644 index 0000000..a98ad4b --- /dev/null +++ b/mc-4.8.26.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27 +size 2492612 diff --git a/mc-extd-doc.patch b/mc-extd-doc.patch index 2e31eb7..cf86091 100644 --- a/mc-extd-doc.patch +++ b/mc-extd-doc.patch @@ -6,8 +6,8 @@ Index: misc/ext.d/doc.sh.in fi ;; msdoc) -- if wvHtml >/dev/null 2>&1; then -+ if wvHtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1; then +- if which wvHtml >/dev/null 2>&1; then ++ if which wvHtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1; then tmp=`mktemp -d ${TMPDIR:-/tmp}/%p.XXXXXX` wvHtml "${MC_EXT_FILENAME}" --targetdir="$tmp" page.html elinks -dump "$tmp/page.html" @@ -15,8 +15,8 @@ Index: misc/ext.d/doc.sh.in fi ;; msxls) -- if xlhtml >/dev/null 2>&1; then -+ if xlhtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1; then +- if which xlhtml >/dev/null 2>&1; then ++ if which xlhtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1; then tmp=`mktemp -d ${TMPDIR:-/tmp}/%p.XXXXXX` xlhtml -a "${MC_EXT_FILENAME}" > "$tmp/page.html" elinks -dump "$tmp/page.html" diff --git a/mc-extd-video.patch b/mc-extd-video.patch index 9d7c5c7..05060c7 100644 --- a/mc-extd-video.patch +++ b/mc-extd-video.patch @@ -25,10 +25,10 @@ Index: misc/ext.d/video.sh case "${filetype}" in *) -- if mplayer >/dev/null 2>&1; then +- if which mplayer >/dev/null 2>&1; then + if type -p mediainfo >/dev/null 2>&1 ; then + mediainfo "${MC_EXT_FILENAME}" -+ elif mplayer >/dev/null 2>&1; then ++ elif which mplayer >/dev/null 2>&1; then mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | \ sed -n 's/^ID_//p' elif which mpv_identify.sh >/dev/null 2>&1; then diff --git a/mc-extfs-iso9660-xorriso.patch b/mc-extfs-iso9660-xorriso.patch index 4ffbbc4..e457abb 100644 --- a/mc-extfs-iso9660-xorriso.patch +++ b/mc-extfs-iso9660-xorriso.patch @@ -1,7 +1,9 @@ ---- src/vfs/extfs/helpers/iso9660.in.orig 2014-04-02 21:42:18.000000000 +0200 -+++ src/vfs/extfs/helpers/iso9660.in 2014-04-02 21:43:40.000000000 +0200 -@@ -46,9 +46,9 @@ - echo "$lsl" | @GREP@ "^[-d]" | \ +Index: src/vfs/extfs/helpers/iso9660.in +=================================================================== +--- src/vfs/extfs/helpers/iso9660.in.orig ++++ src/vfs/extfs/helpers/iso9660.in +@@ -46,9 +46,9 @@ xorriso_list() { + echo "$lsl" | grep "^[-d]" | \ while read attr ln usr gr sz dt1 dt2 dt3 nm ; do len=$((${#nm} - 1)) - name=$(printf -- "$nm" | cut -c2-$len) # remove quotes diff --git a/mc-vfs-fish-deleted_source_file.patch b/mc-vfs-fish-deleted_source_file.patch index 0278567..7bed01b 100644 --- a/mc-vfs-fish-deleted_source_file.patch +++ b/mc-vfs-fish-deleted_source_file.patch @@ -1,8 +1,8 @@ -Index: mc-4.8.22/src/filemanager/file.c +Index: mc-4.8.26/src/filemanager/file.c =================================================================== ---- mc-4.8.22.orig/src/filemanager/file.c -+++ mc-4.8.22/src/filemanager/file.c -@@ -2662,6 +2662,8 @@ copy_file_file (file_op_total_context_t +--- mc-4.8.26.orig/src/filemanager/file.c ++++ mc-4.8.26/src/filemanager/file.c +@@ -2653,6 +2653,8 @@ copy_file_file (file_op_total_context_t continue; if (temp_status == FILE_ABORT) return_status = temp_status; @@ -11,7 +11,7 @@ Index: mc-4.8.22/src/filemanager/file.c if (temp_status == FILE_SKIPALL) ctx->skip_all = TRUE; break; -@@ -2672,6 +2674,8 @@ copy_file_file (file_op_total_context_t +@@ -2663,6 +2665,8 @@ copy_file_file (file_op_total_context_t temp_status = file_error (TRUE, _("Cannot close target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_RETRY) continue; @@ -20,36 +20,36 @@ Index: mc-4.8.22/src/filemanager/file.c if (temp_status == FILE_SKIPALL) ctx->skip_all = TRUE; return_status = temp_status; -@@ -2698,10 +2702,10 @@ copy_file_file (file_op_total_context_t - if (temp_status == FILE_SKIPALL) - { - ctx->skip_all = TRUE; -- return_status = FILE_CONT; -+ return_status = FILE_SKIPALL; - } - if (temp_status == FILE_SKIP) -- return_status = FILE_CONT; -+ return_status = FILE_SKIP; - break; +@@ -2689,10 +2693,10 @@ copy_file_file (file_op_total_context_t + if (temp_status == FILE_SKIPALL) + { + ctx->skip_all = TRUE; +- return_status = FILE_CONT; ++ return_status = FILE_SKIPALL; } + if (temp_status == FILE_SKIP) +- return_status = FILE_CONT; ++ return_status = FILE_SKIP; + break; } -@@ -2719,10 +2723,10 @@ copy_file_file (file_op_total_context_t - if (temp_status == FILE_SKIPALL) - { - ctx->skip_all = TRUE; -- return_status = FILE_CONT; -+ return_status = FILE_SKIPALL; - } - if (temp_status == FILE_SKIP) -- return_status = FILE_CONT; -+ return_status = FILE_SKIP; - break; - } + +@@ -2705,10 +2709,10 @@ copy_file_file (file_op_total_context_t + if (temp_status == FILE_SKIPALL) + { + ctx->skip_all = TRUE; +- return_status = FILE_CONT; ++ return_status = FILE_SKIPALL; } -Index: mc-4.8.22/src/vfs/fish/fishdef.h + if (temp_status == FILE_SKIP) +- return_status = FILE_CONT; ++ return_status = FILE_SKIP; + break; + } + +Index: mc-4.8.26/src/vfs/fish/fishdef.h =================================================================== ---- mc-4.8.22.orig/src/vfs/fish/fishdef.h -+++ mc-4.8.22/src/vfs/fish/fishdef.h +--- mc-4.8.26.orig/src/vfs/fish/fishdef.h ++++ mc-4.8.26/src/vfs/fish/fishdef.h @@ -149,13 +149,19 @@ "FILESIZE=${FISH_FILESIZE}\n" \ "#STOR $FILESIZE $FILENAME\n" \ @@ -71,10 +71,10 @@ Index: mc-4.8.22/src/vfs/fish/fishdef.h /* default 'appe' script */ #define FISH_APPEND_DEF_CONTENT "" \ -Index: mc-4.8.22/src/vfs/fish/helpers/chmod +Index: mc-4.8.26/src/vfs/fish/helpers/chmod =================================================================== ---- mc-4.8.22.orig/src/vfs/fish/helpers/chmod -+++ mc-4.8.22/src/vfs/fish/helpers/chmod +--- mc-4.8.26.orig/src/vfs/fish/helpers/chmod ++++ mc-4.8.26/src/vfs/fish/helpers/chmod @@ -1,6 +1,7 @@ #CHMOD $FISH_FILEMODE $FISH_FILENAME -if chmod ${FISH_FILEMODE} "/${FISH_FILENAME}" 2>/dev/null; then @@ -86,10 +86,10 @@ Index: mc-4.8.22/src/vfs/fish/helpers/chmod +else + echo "### 000" fi -Index: mc-4.8.22/src/vfs/fish/helpers/chown +Index: mc-4.8.26/src/vfs/fish/helpers/chown =================================================================== ---- mc-4.8.22.orig/src/vfs/fish/helpers/chown -+++ mc-4.8.22/src/vfs/fish/helpers/chown +--- mc-4.8.26.orig/src/vfs/fish/helpers/chown ++++ mc-4.8.26/src/vfs/fish/helpers/chown @@ -1,6 +1,7 @@ #CHOWN $FISH_FILEOWNER:$FISH_FILEGROUP $FISH_FILENAME -if chown ${FISH_FILEOWNER}:${FISH_FILEGROUP} "/${FISH_FILENAME}" ; then @@ -101,10 +101,10 @@ Index: mc-4.8.22/src/vfs/fish/helpers/chown +else + echo "### 000" fi -Index: mc-4.8.22/src/vfs/fish/helpers/send +Index: mc-4.8.26/src/vfs/fish/helpers/send =================================================================== ---- mc-4.8.22.orig/src/vfs/fish/helpers/send -+++ mc-4.8.22/src/vfs/fish/helpers/send +--- mc-4.8.26.orig/src/vfs/fish/helpers/send ++++ mc-4.8.26/src/vfs/fish/helpers/send @@ -1,6 +1,9 @@ #STOR $FISH_FILESIZE $FISH_FILENAME FILENAME="/${FISH_FILENAME}" diff --git a/mc.changes b/mc.changes index e5b08eb..0a34326 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sun Mar 14 17:21:31 UTC 2021 - Andreas Stieger + +- Midnight Commander 4.8.26: + * Support file names of any length + * Implement persistent command line buffer for subshell + (bash >= 4, zsh and fish are supported) + * Implement shadows of dialog windows and menus + * Allow running clipboard commands if DISPLAY is not set + * Add support of "alacritty", "tmux", and "tmux-256color" terminals + * VFS: Support wim archive format (using wimtools) + * VFS: Support pak archive format (using unar) + * Editor: Add Swift syntax highlighting + * Various bug fixes + ------------------------------------------------------------------- Mon Jul 27 15:00:00 UTC 2020 - Andre C. Barros diff --git a/mc.spec b/mc.spec index 5e7c14a..691e967 100644 --- a/mc.spec +++ b/mc.spec @@ -1,7 +1,7 @@ # # spec file for package mc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: mc -Version: 4.8.25 +Version: 4.8.26 Release: 0 Summary: Midnight Commander License: GPL-3.0-or-later @@ -126,7 +126,7 @@ export PYTHON=%{_bindir}/python3 --enable-vfs-smb --with-smb-configdir=%{_sysconfdir}/samba \ --disable-vfs-fish -make %{?_smp_mflags} V=1 +%make_build %install %make_install diff --git a/xls2csv_update.patch b/xls2csv_update.patch index 026317d..1851ac9 100644 --- a/xls2csv_update.patch +++ b/xls2csv_update.patch @@ -2,14 +2,14 @@ Author: Adam Majer Upstream: http://midnight-commander.org/ticket/3912 Bugzilla: 1087708 -Index: mc-4.8.22/misc/ext.d/doc.sh.in +Index: mc-4.8.26/misc/ext.d/doc.sh.in =================================================================== ---- mc-4.8.22.orig/misc/ext.d/doc.sh.in -+++ mc-4.8.22/misc/ext.d/doc.sh.in +--- mc-4.8.26.orig/misc/ext.d/doc.sh.in ++++ mc-4.8.26/misc/ext.d/doc.sh.in @@ -74,7 +74,7 @@ do_view_action() { elinks -dump "$tmp/page.html" rm -rf "$tmp" - elif xls2csv >/dev/null 2>&1; then + elif which xls2csv >/dev/null 2>&1; then - xls2csv "${MC_EXT_FILENAME}" + xls2csv -c - -x "${MC_EXT_FILENAME}" else