pool/mc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1248797 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1248797
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=95
This commit is contained in:
Dominique Leuenberger 2025-02-27 13:50:26 +00:00 committed by Git OBS Bridge
commit 4f53ca36d9
15 changed files with 193 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
4575-fix-wrapper.patch
View File

@ -1,97 +0,0 @@
From e2d96fa802abebf888dcc2cc938cfd06abca8eb0 Mon Sep 17 00:00:00 2001
From: "Yury V. Zaytsev" <yury@shurup.com>
Date: Sun, 1 Sep 2024 12:01:37 +0200
Subject: [PATCH] Ticket #4575: adjust mc-wrapper to fit changes in #4535.
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
---
contrib/mc-wrapper.csh.in | 13 ++++++-------
contrib/mc-wrapper.sh.in | 13 +++++++++----
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/contrib/mc-wrapper.csh.in b/contrib/mc-wrapper.csh.in
index 1eca8e7b71..1b00491bc4 100644
--- a/contrib/mc-wrapper.csh.in
+++ b/contrib/mc-wrapper.csh.in
@@ -1,9 +1,9 @@
-set MC_USER=`whoami`
-
-if ($?TMPDIR) then
- setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$
+if ($?MC_TMPDIR) then
+ setenv MC_PWD_FILE "`mktemp '$MC_TMPDIR/mc.pwd.XXXXXX'`"
+else if ($?TMPDIR) then
+ setenv MC_PWD_FILE "`mktemp '$TMPDIR/mc.pwd.XXXXXX'`"
else
- setenv MC_PWD_FILE /tmp/mc-$MC_USER/mc.pwd.$$
+ setenv MC_PWD_FILE "`mktemp '/tmp/mc.pwd.XXXXXX'`"
endif
@bindir@/mc -P "$MC_PWD_FILE" $*
@@ -11,11 +11,10 @@ endif
if (-r "$MC_PWD_FILE") then
setenv MC_PWD "`cat '$MC_PWD_FILE'`"
if ("$MC_PWD" != "$cwd" && -d "$MC_PWD") then
- cd "$MC_PWD"
+ cd "$MC_PWD" || true
endif
unsetenv MC_PWD
endif
rm -f "$MC_PWD_FILE"
unsetenv MC_PWD_FILE
-unsetenv MC_USER
diff --git a/contrib/mc-wrapper.sh.in b/contrib/mc-wrapper.sh.in
index 3905be4800..3d929b3485 100644
--- a/contrib/mc-wrapper.sh.in
+++ b/contrib/mc-wrapper.sh.in
@@ -1,15 +1,20 @@
-MC_USER=`whoami`
-MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$"
+if test -n "$MC_TMPDIR"; then
+ MC_PWD_FILE="`mktemp "${MC_TMPDIR}/mc.pwd.XXXXXX"`"
+elif test -n "$TMPDIR"; then
+ MC_PWD_FILE="`mktemp "${TMPDIR}/mc.pwd.XXXXXX"`"
+else
+ MC_PWD_FILE="`mktemp "/tmp/mc.pwd.XXXXXX"`"
+fi
+
@bindir@/mc -P "$MC_PWD_FILE" "$@"
if test -r "$MC_PWD_FILE"; then
MC_PWD="`cat "$MC_PWD_FILE"`"
if test -n "$MC_PWD" && test "$MC_PWD" != "$PWD" && test -d "$MC_PWD"; then
- cd "$MC_PWD"
+ cd "$MC_PWD" || true
fi
unset MC_PWD
fi
rm -f "$MC_PWD_FILE"
unset MC_PWD_FILE
-unset MC_USER
From d081bc68aa6ad3ded515ea490118b0a38a1ec204 Mon Sep 17 00:00:00 2001
From: "Yury V. Zaytsev" <yury@shurup.com>
Date: Mon, 2 Sep 2024 16:51:17 +0200
Subject: [PATCH] main: remove `O_EXCL` for wd-file since creation is now
managed by wrapper
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
---
src/main.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main.c b/src/main.c
index 803cec146e..02a49ba20e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -509,8 +509,7 @@ main (int argc, char *argv[])
{
int last_wd_fd;
- last_wd_fd = open (mc_args__last_wd_file, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL,
- S_IRUSR | S_IWUSR);
+ last_wd_fd = open (mc_args__last_wd_file, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
if (last_wd_fd != -1)
{
ssize_t ret1;

2
mc-4.8.32.sha256
View File

@ -1,2 +0,0 @@
51a039ebd15d5e442312a7053a4ca28276b7f241050b7714d5bae5362ecd3319 mc-4.8.32.tar.bz2
4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe mc-4.8.32.tar.xz

3
mc-4.8.32.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe
size 2385648

2
mc-4.8.33.sha256 Normal file
View File

@ -0,0 +1,2 @@
a3ceb0af84226fedfe5f339464ff2849c3f6bf0321b72027c47b2c10e66a6dba mc-4.8.33.tar.bz2
cae149d42f844e5185d8c81d7db3913a8fa214c65f852200a9d896b468af164c mc-4.8.33.tar.xz

3
mc-4.8.33.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cae149d42f844e5185d8c81d7db3913a8fa214c65f852200a9d896b468af164c
size 2424476

12
mc-esc-seq.patch
View File

@ -2,11 +2,13 @@
lib/util.c | 2 ++
1 file changed, 2 insertions(+)
--- a/lib/util.c
+++ b/lib/util.c
@@ -762,6 +762,8 @@ strip_ctrl_codes (char *s)
while (*(++r) != '\0' && strchr ("0123456789;:?", *r) != NULL)
;
Index: mc-4.8.33/lib/util.c
===================================================================
--- mc-4.8.33.orig/lib/util.c
+++ mc-4.8.33/lib/util.c
@@ -783,6 +783,8 @@ strip_ctrl_codes (char *s)
while (*r != '\0' && (*r < 0x40 || *r > 0x7E))
++r;
}
+ else if (*r == '(')
+ r++;

8
mc-extd-doc.patch
View File

@ -8,8 +8,8 @@
fi
;;
msdoc)
- if which wvHtml >/dev/null 2>&1; then
+ if which wvHtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1; then
- if command -v wvHtml >/dev/null 2>&1; then
+ if command -v wvHtml >/dev/null 2>&1 && command -v 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"
@ -17,8 +17,8 @@
fi
;;
msxls)
- if which xlhtml >/dev/null 2>&1; then
+ if which xlhtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1; then
- if command -v xlhtml >/dev/null 2>&1; then
+ if command -v xlhtml >/dev/null 2>&1 && command -v 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"

21
mc-extd-misc.patch
View File

@ -1,21 +0,0 @@
---
misc/ext.d/misc.sh.in | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- a/misc/ext.d/misc.sh.in
+++ b/misc/ext.d/misc.sh.in
@@ -52,7 +52,13 @@ do_view_action() {
lyxcat "${MC_EXT_FILENAME}"
;;
torrent)
- ctorrent -x "${MC_EXT_FILENAME}" 2>/dev/null
+ if type -p ctorrent >/dev/null 2>&1 ; then
+ ctorrent -x "${MC_EXT_FILENAME}" 2>/dev/null
+ elif type -p transmission-show >/dev/null 2>&1 ; then
+ transmission-show "${MC_EXT_FILENAME}"
+ else
+ file "${MC_EXT_FILENAME}"
+ fi
;;
javaclass)
jad -p "${MC_EXT_FILENAME}" 2>/dev/null || \

60
mc-extd-sound.patch
View File

@ -1,27 +1,8 @@
---
misc/ext.d/sound.sh | 34 ++++++++++++++++++++++++++--------
1 file changed, 26 insertions(+), 8 deletions(-)
--- a/misc/ext.d/sound.sh
+++ b/misc/ext.d/sound.sh
@@ -6,22 +6,40 @@
action=$1
filetype=$2
-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open"
+[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="_xdg_open"
+
+_xdg_open()
+{
+ if [ -n "$DISPLAY" ] && type -p gmplayer ; then
+ gmplayer "${MC_EXT_FILENAME}"
+ elif type -p mplayer ; then
+ mplayer "${MC_EXT_FILENAME}"
+ else
+ xdg-open "${MC_EXT_FILENAME}"
+ fi
+}
Index: mc-4.8.33/misc/ext.d/sound.sh
===================================================================
--- mc-4.8.33.orig/misc/ext.d/sound.sh
+++ mc-4.8.33/misc/ext.d/sound.sh
@@ -13,6 +13,11 @@ fi
do_view_action() {
filetype=$1
@ -33,35 +14,12 @@
case "${filetype}" in
common)
mediainfo "${MC_EXT_FILENAME}"
;;
-
mp3)
- mpg123 -vtn1 "${MC_EXT_FILENAME}" 2>&1 | \
- sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
+ if type -p mpg123 ; then
+ mpg123 -vtn1 "${MC_EXT_FILENAME}" 2>&1 | \
+ sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
+ return 0
+ fi
;;
ogg)
- ogginfo "${MC_EXT_FILENAME}"
+ type -p ogginfo && ogginfo "${MC_EXT_FILENAME}" && return 0
;;
opus)
opusinfo "${MC_EXT_FILENAME}"
@@ -29,11 +47,11 @@ do_view_action() {
wma)
mplayer -quiet -slave -frames 0 -vo null -ao null -identify "${MC_EXT_FILENAME}" 2>/dev/null | \
@@ -33,7 +38,7 @@ do_view_action() {
tail +13 || file "${MC_EXT_FILENAME}"
- ;;
- *)
;;
*)
- cat "${MC_EXT_FILENAME}"
+ return $?
+ file "${MC_EXT_FILENAME}"
;;
esac
+
+ mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | sed -n '/^ID_/p'
}
do_open_action() {

35
mc-extd-video.patch
View File

@ -2,35 +2,18 @@
misc/ext.d/video.sh | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
--- a/misc/ext.d/video.sh
+++ b/misc/ext.d/video.sh
@@ -6,14 +6,27 @@
action=$1
filetype=$2
-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open"
+[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="_xdg_open"
+
+_xdg_open()
+{
+ if [ -n "$DISPLAY" ] && type -p gmplayer ; then
+ gmplayer "${MC_EXT_FILENAME}"
+ elif type -p mplayer ; then
+ mplayer "${MC_EXT_FILENAME}"
+ else
+ xdg-open "${MC_EXT_FILENAME}"
+ fi
+}
do_view_action() {
filetype=$1
Index: mc-4.8.33/misc/ext.d/video.sh
===================================================================
--- mc-4.8.33.orig/misc/ext.d/video.sh
+++ mc-4.8.33/misc/ext.d/video.sh
@@ -15,7 +15,9 @@ do_view_action() {
case "${filetype}" in
*)
- if which mplayer >/dev/null 2>&1; then
+ if type -p mediainfo >/dev/null 2>&1 ; then
- if command -v mplayer >/dev/null 2>&1; then
+ if command -v mediainfo >/dev/null 2>&1 ; then
+ mediainfo "${MC_EXT_FILENAME}"
+ elif which mplayer >/dev/null 2>&1; then
+ elif command -v 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
elif command -v mpv_identify.sh >/dev/null 2>&1; then

66
mc-extd-xdg.patch
View File

@ -7,11 +7,13 @@
misc/ext.d/sound.sh | 2 +-
misc/ext.d/text.sh.in | 2 +-
misc/ext.d/video.sh | 2 +-
misc/ext.d/web.sh.in | 2 +-
misc/ext.d/web.sh | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
--- a/misc/ext.d/archive.sh
+++ b/misc/ext.d/archive.sh
Index: mc-4.8.33/misc/ext.d/archive.sh
===================================================================
--- mc-4.8.33.orig/misc/ext.d/archive.sh
+++ mc-4.8.33/misc/ext.d/archive.sh
@@ -210,7 +210,7 @@ view)
do_view_action "${filetype}"
;;
@ -21,8 +23,10 @@
do_open_action "${filetype}" "${pager}"
;;
*)
--- a/misc/ext.d/doc.sh.in
+++ b/misc/ext.d/doc.sh.in
Index: mc-4.8.33/misc/ext.d/doc.sh.in
===================================================================
--- mc-4.8.33.orig/misc/ext.d/doc.sh.in
+++ mc-4.8.33/misc/ext.d/doc.sh.in
@@ -210,7 +210,7 @@ view)
do_view_action "${filetype}"
;;
@ -32,9 +36,11 @@
do_open_action "${filetype}"
;;
*)
--- a/misc/ext.d/image.sh
+++ b/misc/ext.d/image.sh
@@ -64,7 +64,7 @@ view)
Index: mc-4.8.33/misc/ext.d/image.sh
===================================================================
--- mc-4.8.33.orig/misc/ext.d/image.sh
+++ mc-4.8.33/misc/ext.d/image.sh
@@ -72,7 +72,7 @@ view)
do_view_action "${filetype}"
;;
open)
@ -43,9 +49,11 @@
do_open_action "${filetype}"
;;
*)
--- a/misc/ext.d/misc.sh.in
+++ b/misc/ext.d/misc.sh.in
@@ -102,7 +102,7 @@ view)
Index: mc-4.8.33/misc/ext.d/misc.sh.in
===================================================================
--- mc-4.8.33.orig/misc/ext.d/misc.sh.in
+++ mc-4.8.33/misc/ext.d/misc.sh.in
@@ -96,7 +96,7 @@ view)
do_view_action "${filetype}"
;;
open)
@ -54,8 +62,10 @@
do_open_action "${filetype}"
;;
*)
--- a/misc/ext.d/package.sh
+++ b/misc/ext.d/package.sh
Index: mc-4.8.33/misc/ext.d/package.sh
===================================================================
--- mc-4.8.33.orig/misc/ext.d/package.sh
+++ mc-4.8.33/misc/ext.d/package.sh
@@ -51,7 +51,7 @@ view)
do_view_action "${filetype}"
;;
@ -65,9 +75,11 @@
do_open_action "${filetype}"
;;
*)
--- a/misc/ext.d/sound.sh
+++ b/misc/ext.d/sound.sh
@@ -116,7 +116,7 @@ view)
Index: mc-4.8.33/misc/ext.d/sound.sh
===================================================================
--- mc-4.8.33.orig/misc/ext.d/sound.sh
+++ mc-4.8.33/misc/ext.d/sound.sh
@@ -105,7 +105,7 @@ view)
do_view_action "${filetype}"
;;
open)
@ -76,8 +88,10 @@
do_open_action "${filetype}"
;;
*)
--- a/misc/ext.d/text.sh.in
+++ b/misc/ext.d/text.sh.in
Index: mc-4.8.33/misc/ext.d/text.sh.in
===================================================================
--- mc-4.8.33.orig/misc/ext.d/text.sh.in
+++ mc-4.8.33/misc/ext.d/text.sh.in
@@ -147,7 +147,7 @@ view)
do_view_action "${filetype}"
;;
@ -87,9 +101,11 @@
do_open_action "${filetype}" "${pager}"
;;
*)
--- a/misc/ext.d/video.sh
+++ b/misc/ext.d/video.sh
@@ -66,7 +66,7 @@ view)
Index: mc-4.8.33/misc/ext.d/video.sh
===================================================================
--- mc-4.8.33.orig/misc/ext.d/video.sh
+++ mc-4.8.33/misc/ext.d/video.sh
@@ -50,7 +50,7 @@ view)
do_view_action "${filetype}"
;;
open)
@ -98,9 +114,11 @@
do_open_action "${filetype}"
;;
*)
--- a/misc/ext.d/web.sh.in
+++ b/misc/ext.d/web.sh.in
@@ -47,7 +47,7 @@ view)
Index: mc-4.8.33/misc/ext.d/web.sh
===================================================================
--- mc-4.8.33.orig/misc/ext.d/web.sh
+++ mc-4.8.33/misc/ext.d/web.sh
@@ -52,7 +52,7 @@ view)
do_view_action "${filetype}"
;;
open)

64
mc-vfs-fish-deleted_source_file.patch
View File

@ -1,50 +1,16 @@
---
src/filemanager/file.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--- a/src/filemanager/file.c
+++ b/src/filemanager/file.c
@@ -2802,6 +2802,8 @@ copy_file_file (file_op_total_context_t
continue;
if (temp_status == FILE_ABORT)
return_status = temp_status;
+ if (temp_status == FILE_SKIP)
+ return_status = temp_status;
if (temp_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
break;
@@ -2812,6 +2814,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;
+ if (temp_status == FILE_SKIP)
+ return_status = temp_status;
if (temp_status == FILE_SKIPALL)
ctx->skip_all = TRUE;
return_status = temp_status;
@@ -2843,10 +2847,10 @@ copy_file_file (file_op_total_context_t
if (temp_status == FILE_SKIPALL)
Index: mc-4.8.33/src/vfs/shell/helpers/send
===================================================================
--- mc-4.8.33.orig/src/vfs/shell/helpers/send
+++ mc-4.8.33/src/vfs/shell/helpers/send
@@ -1,7 +1,10 @@
FILENAME="/${SHELL_FILENAME}"
echo "### 001"
{
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;
}
@@ -2859,10 +2863,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;
}
- > "${FILENAME}"
+ if ! > "${FILENAME}"; then
+ echo "### 500"
+ exit
+ fi
bss=4096
bsl=4095
if [ $SHELL_FILESIZE -lt $bss ]; then

56
mc.changes
View File

@ -1,3 +1,59 @@
-------------------------------------------------------------------
Mon Jan 27 21:01:26 UTC 2025 - Adam Mizerski <adam@mizerski.pl>
- Update to 4.8.33:
- Core
* Minimal version of Automake is 1.14 (#4604)
* Upgrade C standard to C99 (#4604)
* Support ksh variants as subshell (#3748)
* Improve fish 4.0 shell support (#4597)
* Add support for bash PROMPT_COMMAND being an array (#4599)
* Don't override ENV variable for ash/dash subshell (#4605)
* Don't disable verbose mode if tty baudrate can't be reliably determined (#2452)
* New keymap for vim users (#4588)
- VFS
* extfs vfs: chmod/chown inside extfs (e.g. zip archive) silently fails (#4629)
* Add embedded torrent viewer/vfs (#3100)
- Misc
* Code cleanup (#4572, #4593, #4595, #4598)
* Adjust mc-wrappers to work with the new MC_TMPDIR creation logic (#4575)
* Prefer console players for sound, images and video in non-graphical sessions (#4479, #4596)
* Support `TERM=xterm-clear` for FreeBSD users (#2633)
* mc.ext.ini:
- Support for Rust crates file format (#4609)
- Support for OpenEmbedded ipk archives (#4626)
* ext.d: select browser at runtime (#4615)
* Move CI from Travis to GitHub Actions (#4170, #3738, #4602)
- Fixes
* Segfault if filter makes file panel empty (#4600)
* Segfault in built-in help when going to the previous topic (#4627)
* Incorrect handling of ext2 attributes of a directory (#4590)
* Failed copy/move operations make ETA inaccurate (#3205, #4613, #4623)
* Hotlist: use after free (#4621)
* mc.ext.ini: typo for apt view command line (#4583)
* mcedit: visual glitches if built with aspell, but libraries not installed (#4576)
* mcedit: segfault on new file creation (#4580)
* mcedit: PageDown skips lines in edit window (#4617)
* mcedit: cursor jumps during PageDown in edit window (#4618)
* mvciew: false-positive regex search of BOL (#4587)
* mcdiff: segmentation fault on empty files merge (#4608)
* tar vfs: double free (#4616)
* sftpfs vfs: use after free (#4620)
* tests: fix charset-related code on non-glibc platforms (Alpine, Illumos) (#3972, #4495)
* tests: use weak symbols instead of symbol duplication to support non-GNU linkers / macOS (#4584, #3542)
- Removed patches:
- 4575-fix-wrapper.patch - merged upstream
- mc-extd-misc.patch - reslved upstream
- mc-vfs-fish-deleted_source_file.patch - resolved upstream TODO verify
- Refreshed patches:
- mc-esc-seq.patch
- mc-extd-doc.patch
- mc-extd-sound.patch
- mc-extd-video.patch
- mc-extd-xdg.patch
- xls2csv_update.patch
- Rewrote patch mc-vfs-fish-deleted_source_file.patch
-------------------------------------------------------------------
Tue Dec 3 12:13:23 UTC 2024 - Matej Cepl <mcepl@cepl.eu>

72
mc.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package mc
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 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.32
Version: 4.8.33
Release: 0
Summary: Midnight Commander
License: GPL-3.0-or-later
@ -32,9 +32,6 @@ Source6: http://ftp.midnight-commander.org/%{name}-%{version}.sha256
Source7: mc.fish
Patch0: mc-fix_lib_search_path.patch
Patch12: mc-wrapper.patch
# PATCH-FIX-UPSTREAM 4575-fix-wrapper.patch https://midnight-commander.org/ticket/4575 -- fix mc-wrapper (already merged for next release)
# + https://github.com/MidnightCommander/mc/commit/d081bc68aa6ad3ded515ea490118b0a38a1ec204
Patch13: 4575-fix-wrapper.patch
Patch16: mc-esc-seq.patch
Patch20: mc-f-keys.patch
Patch21: mc-extfs-helpers-deb.patch
@ -51,7 +48,6 @@ Patch42: 4258-fish-subshell-prompt.patch
# Patches from Fedora
#Patch adding -fpie and -pie to compilation and linking of setuid binaries
Patch52: mc-pie.patch
Patch61: mc-extd-misc.patch
Patch62: mc-extd-video.patch
Patch63: mc-extd-doc.patch
Patch64: mc-extd-sound.patch
@ -77,7 +73,6 @@ BuildRequires: pkgconfig(x11)
Requires(pre): permissions
Recommends: %{name}-lang = %{version}
Enhances: fish
Recommends: mkisofs
Recommends: xorriso
%description
@ -129,8 +124,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/profile.d
ln -fs -t %{buildroot}%{_sysconfdir}/profile.d %{_datadir}/mc/mc.{,c}sh
#support script for calling available GUI webbrosers
install -m 755 %{SOURCE1} %{buildroot}%{_datadir}/mc/
install -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
mkdir -p %{buildroot}%{_datadir}/pixmaps/
ln -s ../icons/hicolor/32x32/apps/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
# Fish wrapper script
install -D -m 644 %{SOURCE7} \
@ -152,11 +148,7 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask
%endif
%post
%if 0%{?suse_version} >= 1140
%set_permissions %{_libexecdir}/mc/cons.saver
%else
%run_permissions
%endif
%verifyscript
%verify_permissions -e %{_libexecdir}/mc/cons.saver
@ -175,6 +167,7 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask
%config %{_sysconfdir}/mc/mc.keymap
%config %{_sysconfdir}/mc/mc.default.keymap
%config %{_sysconfdir}/mc/mc.emacs.keymap
%config %{_sysconfdir}/mc/mc.vim.keymap
%config %{_sysconfdir}/mc/edit.indent.rc
%dir %{_libexecdir}/mc
%{_libexecdir}/mc/ext.d
@ -184,13 +177,8 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask
%exclude %{_mandir}/*/man1/*
%{_mandir}/man1/*
%{_datadir}/mc
%{_datadir}/mc/syntax/Syntax
%{_datadir}/mc/mc.charsets
%{_datadir}/mc/mc.lib
%exclude %{_datadir}/mc/hints/mc.hint.*
%{_datadir}/mc/hints/mc.hint
%exclude %{_datadir}/mc/help/mc.hlp.*
%{_datadir}/mc/help/mc.hlp
%exclude %{_datadir}/locale/*/LC_MESSAGES/mc.mo
%dir %{_datadir}/fish
@ -205,33 +193,53 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%files lang -f %{name}.lang
%if 0%{?suse_version} < 1140 || 0%{?sles_version} && 0%{?sles_version} <= 11
%lang(sv) %dir %{_datadir}/locale/sv_SE
%lang(sv) %dir %{_datadir}/locale/sv_SE/LC_MESSAGES
%lang(szl) %dir %{_datadir}/locale/szl
%lang(szl) %dir %{_datadir}/locale/szl/LC_MESSAGES
%endif
%lang(hu) %dir %{_mandir}/hu/
%lang(hu) %dir %{_mandir}/hu/man1/
%lang(es) %{_mandir}/es/man1/mc.1.gz
%lang(hu) %{_mandir}/hu/man1/mc.1.gz
%lang(pl) %dir %{_mandir}/pl/
%lang(pl) %dir %{_mandir}/pl/man1/
%lang(it) %{_mandir}/it/man1/mc.1.gz
%lang(pl) %{_mandir}/pl/man1/mc.1.gz
%lang(sr) %dir %{_mandir}/sr/
%lang(sr) %dir %{_mandir}/sr/man1/
%lang(ru) %{_mandir}/ru/man1/mc.1.gz
%if 0%{?suse_version} < 1600 && 0%{?is_opensuse}
%lang(sr) %dir %{_mandir}/sr
%lang(sr) %dir %{_mandir}/sr/man1
%endif
%lang(sr) %{_mandir}/sr/man1/mc.1.gz
%lang(be) %doc %{_datadir}/mc/*/mc.*.be
%lang(bg) %doc %{_datadir}/mc/*/mc.*.bg
%lang(ca) %doc %{_datadir}/mc/*/mc.*.ca
%lang(cs) %doc %{_datadir}/mc/*/mc.*.cs
%lang(da) %doc %{_datadir}/mc/*/mc.*.da
%lang(de) %doc %{_datadir}/mc/*/mc.*.de
%lang(el) %doc %{_datadir}/mc/*/mc.*.el
%lang(en_GB) %doc %{_datadir}/mc/*/mc.*.en_GB
%lang(eo) %doc %{_datadir}/mc/*/mc.*.eo
%lang(es) %doc %{_datadir}/mc/*/mc.*.es
%lang(et) %doc %{_datadir}/mc/*/mc.*.et
%lang(eu) %doc %{_datadir}/mc/*/mc.*.eu
%lang(fa) %doc %{_datadir}/mc/*/mc.*.fa
%lang(fr) %doc %{_datadir}/mc/*/mc.*.fr
%lang(ga) %doc %{_datadir}/mc/*/mc.*.ga
%lang(gl) %doc %{_datadir}/mc/*/mc.*.gl
%lang(hu) %doc %{_datadir}/mc/*/mc.*.hu
%lang(id) %doc %{_datadir}/mc/*/mc.*.id
%lang(it) %doc %{_datadir}/mc/*/mc.*.it
%lang(ja) %doc %{_datadir}/mc/*/mc.*.ja
%lang(ka) %doc %{_datadir}/mc/*/mc.*.ka
%lang(ko) %doc %{_datadir}/mc/*/mc.*.ko
%lang(lt) %doc %{_datadir}/mc/*/mc.*.lt
%lang(nb) %doc %{_datadir}/mc/*/mc.*.nb
%lang(nl) %doc %{_datadir}/mc/*/mc.*.nl
%lang(pl) %doc %{_datadir}/mc/*/mc.*.pl
%lang(pt) %doc %{_datadir}/mc/*/mc.*.pt
%lang(pt_BR) %doc %{_datadir}/mc/*/mc.*.pt_BR
%lang(ro) %doc %{_datadir}/mc/*/mc.*.ro
%lang(ru) %doc %{_datadir}/mc/*/mc.*.ru
%lang(sk) %doc %{_datadir}/mc/*/mc.*.sk
%lang(sr) %doc %{_datadir}/mc/*/mc.*.sr
%lang(sv) %doc %{_datadir}/mc/*/mc.*.sv
%lang(tr) %doc %{_datadir}/mc/*/mc.*.tr
%lang(uk) %doc %{_datadir}/mc/*/mc.*.uk
%lang(zh_CN) %doc %{_datadir}/mc/*/mc.*.zh_CN
%lang(zh_TW) %doc %{_datadir}/mc/*/mc.*.zh_TW
%changelog

8
xls2csv_update.patch
View File

@ -6,12 +6,14 @@ Bugzilla: 1087708
misc/ext.d/doc.sh.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/misc/ext.d/doc.sh.in
+++ b/misc/ext.d/doc.sh.in
Index: mc-4.8.33/misc/ext.d/doc.sh.in
===================================================================
--- mc-4.8.33.orig/misc/ext.d/doc.sh.in
+++ mc-4.8.33/misc/ext.d/doc.sh.in
@@ -74,7 +74,7 @@ do_view_action() {
elinks -dump "$tmp/page.html"
rm -rf "$tmp"
elif which xls2csv >/dev/null 2>&1; then
elif command -v xls2csv >/dev/null 2>&1; then
- xls2csv "${MC_EXT_FILENAME}"
+ xls2csv -c - -x "${MC_EXT_FILENAME}"
else