SHA256
1
0
forked from pool/mc

10 Commits

Author SHA256 Message Date
fad2d34f8f Accepting request 1326268 from Base:System
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1326268
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=96
2026-01-09 16:03:08 +00:00
Adam Mizerski
839af35411 - run obs/service/source_validators/helpers/fix_changelog
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=168
2026-01-07 15:40:10 +00:00
4f53ca36d9 Accepting request 1248797 from Base:System
OBS-URL: https://build.opensuse.org/request/show/1248797
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=95
2025-02-27 13:50:26 +00:00
Adam Mizerski
5ba915ac25 Update to 4.8.33
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=166
2025-02-26 20:28:04 +00:00
9d7ce9a1df Accepting request 1228570 from Base:System
OBS-URL: https://build.opensuse.org/request/show/1228570
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=94
2024-12-06 13:25:22 +00:00
f1b234770f - Add mc-ext-obscpio.patch making mc handle SUSE *.obscpio
archives (bsc#1233006).

OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=164
2024-12-05 17:21:00 +00:00
01bb0ae3d5 Accepting request 1220049 from Base:System
OBS-URL: https://build.opensuse.org/request/show/1220049
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=93
2024-11-02 15:11:37 +00:00
Adam Mizerski
e56f4cedf4 Added patch 4575-fix-wrapper.patch - fixes boo#1203617
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=162
2024-11-01 11:35:36 +00:00
bc784ee2c1 Accepting request 1201658 from Base:System
OBS-URL: https://build.opensuse.org/request/show/1201658
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=92
2024-09-18 13:26:40 +00:00
3be791fd2c - Update to 4.8.32:
- Core
    - Tell the current directory to the terminal using OSC 7 sequence (so it can open new tabs there) (#3088)
    - Preserve ext2fs attributes on copy/move operations (#4532)
    - Change name of temporary directory: make it unique for each run (#4535)
    - Hide password in file operation progress dialog (#4541)
    - Support reget in file move operation (#4563)
    - Implement nanosecond precision timestamps on non-Linux (macOS, BSD, AIX, Solaris) (#4563)
    - Remove remaining mmap code to simplify maintenance (#3960) 
  - VFS
    - extfs: support unrar-7 (#4518) 
  - Editor
    - Improve syntax highlighting:
    -     C and C++ (MidnightCommander?/mc#195, #4556) 
  - Viewer
  - Diff viewer
    - Add man page mcdiff.1 (#4224) 
  - Misc
    - Code cleanup (#4524)
    - New skins
      - xoria256-thin, xoria256root-thin (#4530)
      - modarcon16-defbg-thin, modarcon16-thin, modarcon16root-defbg-thin, modarcon16root-thin (#4530)
      - modarin256-defbg-thin, modarin256-thin, modarin256root-defbg-thin, modarin256root-thin (#4530)
      - julia256root (#4536) 
    - mc.ext.ini: clarify escaping of spaces and parenthesis (#4502) 
  - Fixes
    - External editor does not work with arguments in $EDITOR (#4533)
    - fish shell: strings " cd (printf '%b' ... " in history (#4521)
    - Redundant back slashes for autocomplete (#4292)
    - subshell: call execl with argv[0] that is not an actual path to Bash (#4549)
    - mcedit: php.syntax: comment highlight from start of light only (#4519)
    - mcedit: wrong replacement using regular expressions with begin or end of line (#4525, #4526)
    - mcedit: losing column position when navigating up/down (MidnightCommander?/mc#194)
    - mcedit: macro deletes text (#4540)
    - mcedit: macros are applied to the pasted text (#4562)
    - extfs: iso9660: xorriso is slow to open an ISO image (#3570, #4567)
    - extfs: u7z: wrong add of nested directories to archive (#4559)
    - extfs: segfault on enter to deleted archive (#4560)
    - tar: segfault on copy files from archive (#4561)
    - man: typo (#4550) 
- Remove mc-extfs-iso9660-xorriso.patch patch which doesn't apply anymore.
- Other patches reapplied.

OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=160
2024-09-17 15:26:47 +00:00
25 changed files with 394 additions and 323 deletions

View File

@@ -3,18 +3,14 @@ Bug-Debian: http://bugs.debian.org/540238
Author: Denis Briand <denis@narcan.fr>
Author: Jindřich Makovička
Index: contrib/mc.csh.in
===================================================================
--- contrib/mc.csh.in.orig 2010-07-05 21:12:51.000000000 +0200
+++ contrib/mc.csh.in 2010-07-07 18:54:54.616547000 +0200
@@ -1 +1 @@
-alias mc 'source @pkglibexecdir@/mc-wrapper.csh'
+alias mc 'source @datadir@/mc/mc-wrapper.csh'
Index: contrib/Makefile.am
===================================================================
--- contrib/Makefile.am.orig 2010-07-05 21:12:51.000000000 +0200
+++ contrib/Makefile.am 2010-07-07 18:56:25.946339000 +0200
@@ -8,7 +8,7 @@ SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapp
---
contrib/Makefile.am | 2 +-
contrib/mc.csh.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -5,7 +5,7 @@ SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapp
SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
@@ -23,3 +19,8 @@ Index: contrib/Makefile.am
cfgdir = $(sysconfdir)/@PACKAGE@
cfg_DATA = \
--- a/contrib/mc.csh.in
+++ b/contrib/mc.csh.in
@@ -1 +1 @@
-alias mc 'source @pkglibexecdir@/mc-wrapper.csh'
+alias mc 'source @datadir@/mc/mc-wrapper.csh'

View File

@@ -1,10 +1,10 @@
---
src/subshell/common.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
src/subshell/common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/subshell/common.c
+++ b/src/subshell/common.c
@@ -713,7 +713,7 @@ parse_subshell_prompt_string (const char
@@ -715,7 +715,7 @@ parse_subshell_prompt_string (const char
/* Extract the prompt from the shell output */
for (i = 0; i < bytes; i++)

View File

@@ -1,2 +0,0 @@
f42f4114ed42f6cf9995f1d896fa6c797ccb36dac57760dda8dd9f78ac462841 mc-4.8.31.tar.bz2
24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a mc-4.8.31.tar.xz

View File

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

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

View File

@@ -1,8 +1,14 @@
--- lib/util.c.orig 2014-09-05 20:50:09.000000000 +0200
+++ lib/util.c 2014-09-05 20:51:02.000000000 +0200
@@ -752,6 +752,8 @@ strip_ctrl_codes (char *s)
while (*(++r) != '\0' && strchr ("0123456789;:?", *r) != NULL)
;
---
lib/util.c | 2 ++
1 file changed, 2 insertions(+)
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++;

View File

@@ -1,7 +1,9 @@
Index: mc-4.8.31/misc/mc.ext.ini.in
===================================================================
--- mc-4.8.31.orig/misc/mc.ext.ini.in
+++ mc-4.8.31/misc/mc.ext.ini.in
---
misc/mc.ext.ini.in | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
--- a/misc/mc.ext.ini.in
+++ b/misc/mc.ext.ini.in
@@ -591,23 +591,26 @@ Open=@EXTHELPERSDIR@/image.sh open avif
[sound]
Regex=\\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv|spx|flac)$

43
mc-ext-obscpio.patch Normal file
View File

@@ -0,0 +1,43 @@
---
misc/ext.d/archive.sh | 3 +++
misc/filehighlight.ini | 2 +-
misc/mc.ext.ini.in | 5 +++++
3 files changed, 9 insertions(+), 1 deletion(-)
--- a/misc/ext.d/archive.sh
+++ b/misc/ext.d/archive.sh
@@ -136,6 +136,9 @@ do_view_action() {
cpio)
cpio -itv < "${MC_EXT_FILENAME}" 2>/dev/null
;;
+ obscpio)
+ cpio -itv < "${MC_EXT_FILENAME}" 2>/dev/null
+ ;;
7z)
7za l "${MC_EXT_FILENAME}" 2>/dev/null ||
7z l "${MC_EXT_FILENAME}"
--- a/misc/filehighlight.ini
+++ b/misc/filehighlight.ini
@@ -25,7 +25,7 @@
regexp=(^#.*|.*~$)
[archive]
- extensions=7z;Z;ace;apk;arc;arj;ark;bz2;cab;cpio;deb;gz;lha;lz;lz4;lzh;lzma;lzo;rar;rpm;tar;tbz;tbz2;tgz;tlz;txz;tzo;tzst;vsix;xz;zip;zoo;zst
+ extensions=7z;Z;ace;apk;arc;arj;ark;bz2;cab;cpio;obscpio;deb;gz;lha;lz;lz4;lzh;lzma;lzo;rar;rpm;tar;tbz;tbz2;tgz;tlz;txz;tzo;tzst;vsix;xz;zip;zoo;zst
[doc]
extensions=chm;css;ctl;diz;doc;docm;docx;dtd;fodg;fodp;fods;fodt;htm;html;json;letter;lsm;mail;man;markdown;md;me;mkd;msg;nroff;odg;odp;ods;odt;pdf;po;ppt;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xls;xlsm;xlsx;xml;xsd;xslt
--- a/misc/mc.ext.ini.in
+++ b/misc/mc.ext.ini.in
@@ -349,6 +349,11 @@ Shell=.cpio
ShellIgnoreCase=true
Include=cpio
+[obscpio]
+Shell=.obscpio
+Open=%cd %p/ucpio://
+View=%view{ascii} @EXTHELPERSDIR@/archive.sh view obscpio
+
[initrd]
Regex=^(initramfs.*\\.img|initrd(-.+)?\\.img(-.+)?)$
Include=cpio

View File

@@ -1,13 +1,15 @@
Index: misc/ext.d/doc.sh.in
===================================================================
--- misc/ext.d/doc.sh.in.orig
+++ misc/ext.d/doc.sh.in
---
misc/ext.d/doc.sh.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/misc/ext.d/doc.sh.in
+++ b/misc/ext.d/doc.sh.in
@@ -52,7 +52,7 @@ do_view_action() {
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"
@@ -15,8 +17,8 @@ Index: misc/ext.d/doc.sh.in
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"

View File

@@ -1,13 +0,0 @@
--- misc/ext.d/misc.sh.in.orig 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/misc.sh.in 2013-03-09 12:10:56.696615817 +0400
@@ -47,3 +47,9 @@
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
;;

View File

@@ -1,25 +1,8 @@
Index: misc/ext.d/sound.sh
Index: mc-4.8.33/misc/ext.d/sound.sh
===================================================================
--- misc/ext.d/sound.sh.orig
+++ 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
+}
--- 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
@@ -31,35 +14,12 @@ Index: misc/ext.d/sound.sh
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() {

View File

@@ -1,34 +1,19 @@
Index: misc/ext.d/video.sh
---
misc/ext.d/video.sh | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
Index: mc-4.8.33/misc/ext.d/video.sh
===================================================================
--- misc/ext.d/video.sh.orig
+++ 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
--- 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

View File

@@ -1,7 +1,19 @@
Index: misc/ext.d/archive.sh
---
misc/ext.d/archive.sh | 2 +-
misc/ext.d/doc.sh.in | 2 +-
misc/ext.d/image.sh | 2 +-
misc/ext.d/misc.sh.in | 2 +-
misc/ext.d/package.sh | 2 +-
misc/ext.d/sound.sh | 2 +-
misc/ext.d/text.sh.in | 2 +-
misc/ext.d/video.sh | 2 +-
misc/ext.d/web.sh | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
Index: mc-4.8.33/misc/ext.d/archive.sh
===================================================================
--- misc/ext.d/archive.sh.orig
+++ 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}"
;;
@@ -11,10 +23,10 @@ Index: misc/ext.d/archive.sh
do_open_action "${filetype}" "${pager}"
;;
*)
Index: misc/ext.d/doc.sh.in
Index: mc-4.8.33/misc/ext.d/doc.sh.in
===================================================================
--- misc/ext.d/doc.sh.in.orig
+++ 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}"
;;
@@ -24,11 +36,11 @@ Index: misc/ext.d/doc.sh.in
do_open_action "${filetype}"
;;
*)
Index: misc/ext.d/image.sh
Index: mc-4.8.33/misc/ext.d/image.sh
===================================================================
--- misc/ext.d/image.sh.orig
+++ misc/ext.d/image.sh
@@ -64,7 +64,7 @@ view)
--- 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)
@@ -37,11 +49,11 @@ Index: misc/ext.d/image.sh
do_open_action "${filetype}"
;;
*)
Index: misc/ext.d/misc.sh.in
Index: mc-4.8.33/misc/ext.d/misc.sh.in
===================================================================
--- misc/ext.d/misc.sh.in.orig
+++ misc/ext.d/misc.sh.in
@@ -102,7 +102,7 @@ view)
--- 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)
@@ -50,10 +62,10 @@ Index: misc/ext.d/misc.sh.in
do_open_action "${filetype}"
;;
*)
Index: misc/ext.d/package.sh
Index: mc-4.8.33/misc/ext.d/package.sh
===================================================================
--- misc/ext.d/package.sh.orig
+++ 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}"
;;
@@ -63,11 +75,11 @@ Index: misc/ext.d/package.sh
do_open_action "${filetype}"
;;
*)
Index: misc/ext.d/sound.sh
Index: mc-4.8.33/misc/ext.d/sound.sh
===================================================================
--- misc/ext.d/sound.sh.orig
+++ misc/ext.d/sound.sh
@@ -116,7 +116,7 @@ view)
--- 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,10 +88,10 @@ Index: misc/ext.d/sound.sh
do_open_action "${filetype}"
;;
*)
Index: misc/ext.d/text.sh.in
Index: mc-4.8.33/misc/ext.d/text.sh.in
===================================================================
--- misc/ext.d/text.sh.in.orig
+++ 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}"
;;
@@ -89,11 +101,11 @@ Index: misc/ext.d/text.sh.in
do_open_action "${filetype}" "${pager}"
;;
*)
Index: misc/ext.d/video.sh
Index: mc-4.8.33/misc/ext.d/video.sh
===================================================================
--- misc/ext.d/video.sh.orig
+++ misc/ext.d/video.sh
@@ -66,7 +66,7 @@ view)
--- 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)
@@ -102,11 +114,11 @@ Index: misc/ext.d/video.sh
do_open_action "${filetype}"
;;
*)
Index: misc/ext.d/web.sh.in
Index: mc-4.8.33/misc/ext.d/web.sh
===================================================================
--- misc/ext.d/web.sh.in.orig
+++ misc/ext.d/web.sh.in
@@ -47,7 +47,7 @@ view)
--- 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)

View File

@@ -1,6 +1,10 @@
--- src/vfs/extfs/helpers/deb.in.orig 2012-04-20 11:21:37.000000000 +0400
+++ src/vfs/extfs/helpers/deb.in 2012-07-23 17:21:47.000000000 +0400
@@ -176,6 +176,15 @@
---
src/vfs/extfs/helpers/deb.in | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
--- a/src/vfs/extfs/helpers/deb.in
+++ b/src/vfs/extfs/helpers/deb.in
@@ -179,6 +179,15 @@ sub mcdebfs_run
}
}
@@ -16,7 +20,7 @@
$pressinstall=<<EOInstall;
WARNING
@@ -192,6 +201,20 @@
@@ -195,6 +204,20 @@ EOInstall
umask 077;

View File

@@ -1,16 +0,0 @@
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
+ name=$(printf -- '%s' "$nm" | cut -c2-$len) # remove quotes
- if test $(printf -- "$attr" | cut -c1-1) != "d"; then
+ if test $(printf -- '%s' "$attr" | cut -c1-1) != "d"; then
printf -- "%s %s %s %s %s %s %s %s %s/%s\n" "$attr" "$ln" "$usr" "$gr" "$sz" "$dt1" "$dt2" "$dt3" "$dir" "$name"
else
xorriso_list "$1" "$dir/$name"

View File

@@ -1,8 +1,10 @@
Index: lib/tty/key.c
===================================================================
--- lib/tty/key.c.orig 2010-07-05 21:12:51.000000000 +0200
+++ lib/tty/key.c 2010-07-07 11:35:25.871011522 +0200
@@ -300,6 +300,11 @@ static key_define_t xterm_key_defines[]
---
lib/tty/key.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/lib/tty/key.c
+++ b/lib/tty/key.c
@@ -304,6 +304,11 @@ static key_define_t xterm_key_defines[]
{KEY_F (9), ESC_STR "[20~", MCKEY_NOACTION},
{KEY_F (10), ESC_STR "[21~", MCKEY_NOACTION},

View File

@@ -1,8 +1,10 @@
Index: m4.include/mc-with-screen-ncurses.m4
===================================================================
--- m4.include/mc-with-screen-ncurses.m4.orig 2010-07-05 21:12:51.000000000 +0200
+++ m4.include/mc-with-screen-ncurses.m4 2010-07-07 17:20:37.294701000 +0200
@@ -9,7 +9,14 @@ AC_DEFUN([MC_CHECK_NCURSES_BY_PATH], [
---
m4.include/mc-with-screen-ncurses.m4 | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--- a/m4.include/mc-with-screen-ncurses.m4
+++ b/m4.include/mc-with-screen-ncurses.m4
@@ -9,7 +9,14 @@ AC_DEFUN([mc_CHECK_NCURSES_BY_PATH], [
fi
if test x"$ac_ncurses_lib_path" != x; then
@@ -18,7 +20,7 @@ Index: m4.include/mc-with-screen-ncurses.m4
fi
saved_CPPFLAGS="$CPPFLAGS"
@@ -32,9 +39,6 @@ AC_DEFUN([MC_CHECK_NCURSES_BY_PATH], [
@@ -32,9 +39,6 @@ AC_DEFUN([mc_CHECK_NCURSES_BY_PATH], [
if test x"$ac_ncurses_inc_path" = x; then
ac_ncurses_inc_path="-I/usr/include"
fi

View File

@@ -4,11 +4,9 @@ http://www.midnight-commander.org/ticket/287
lib/tty/tty-slang.h | 1 +
2 files changed, 16 insertions(+), 2 deletions(-)
Index: mc-4.8.23/lib/tty/key.c
===================================================================
--- mc-4.8.23.orig/lib/tty/key.c
+++ mc-4.8.23/lib/tty/key.c
@@ -1050,10 +1050,13 @@ correct_key_code (int code)
--- a/lib/tty/key.c
+++ b/lib/tty/key.c
@@ -1060,10 +1060,13 @@ correct_key_code (int code)
mod = KEY_M_SHIFT;
}
@@ -23,7 +21,7 @@ Index: mc-4.8.23/lib/tty/key.c
/*
* We are not interested if Ctrl was pressed when entering control
* characters, so assume that it was. When checking for such keys,
@@ -1126,6 +1129,16 @@ correct_key_code (int code)
@@ -1136,6 +1139,16 @@ correct_key_code (int code)
if (c >= KEY_F (1) && c <= KEY_F (20))
mod &= ~KEY_M_SHIFT;
@@ -40,7 +38,7 @@ Index: mc-4.8.23/lib/tty/key.c
if (!mc_global.tty.alternate_plus_minus)
switch (c)
{
@@ -1909,7 +1922,7 @@ get_key_code (int no_delay)
@@ -1889,7 +1902,7 @@ get_key_code (int no_delay)
{
/* Convert escape-digits to F-keys */
if (g_ascii_isdigit (c))
@@ -49,11 +47,9 @@ Index: mc-4.8.23/lib/tty/key.c
else if (c == ' ')
c = ESC_CHAR;
else
Index: mc-4.8.23/lib/tty/tty-slang.h
===================================================================
--- mc-4.8.23.orig/lib/tty/tty-slang.h
+++ mc-4.8.23/lib/tty/tty-slang.h
@@ -11,6 +11,7 @@
--- a/lib/tty/tty-slang.h
+++ b/lib/tty/tty-slang.h
@@ -7,6 +7,7 @@
/*** typedefs(not structures) and defined constants **********************************************/
#define KEY_F(x) (1000 + x)

View File

@@ -1,6 +1,10 @@
--- mc-4.8.1.7/src/consaver/Makefile.am.orig 2012-12-28 12:47:48.000000000 +0400
+++ mc-4.8.1.7/src/consaver/Makefile.am 2013-03-07 10:00:44.473817319 +0400
@@ -4,4 +4,6 @@
---
src/consaver/Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/src/consaver/Makefile.am
+++ b/src/consaver/Makefile.am
@@ -4,4 +4,6 @@ pkglibexec_PROGRAMS = cons.saver
cons_saver_SOURCES = cons.saver.c

View File

@@ -1,48 +1,16 @@
Index: mc-4.8.31/src/filemanager/file.c
Index: mc-4.8.33/src/vfs/shell/helpers/send
===================================================================
--- mc-4.8.31.orig/src/filemanager/file.c
+++ mc-4.8.31/src/filemanager/file.c
@@ -2744,6 +2744,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;
@@ -2754,6 +2756,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;
@@ -2785,10 +2789,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;
}
@@ -2801,10 +2805,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;
}
--- 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"
{
- > "${FILENAME}"
+ if ! > "${FILENAME}"; then
+ echo "### 500"
+ exit
+ fi
bss=4096
bsl=4095
if [ $SHELL_FILESIZE -lt $bss ]; then

View File

@@ -3,10 +3,8 @@
contrib/mc.sh.in | 9 ++++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
Index: mc-4.8.30/contrib/Makefile.am
===================================================================
--- mc-4.8.30.orig/contrib/Makefile.am
+++ mc-4.8.30/contrib/Makefile.am
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -19,10 +19,10 @@ EXTRA_DIST = \
$(noinst_DATA)
@@ -20,10 +18,8 @@ Index: mc-4.8.30/contrib/Makefile.am
mc-wrapper.csh: $(top_builddir)/config.status $(srcdir)/mc-wrapper.csh.in
$(SED) "s%@""bindir@%$(bindir)%" $(srcdir)/mc-wrapper.csh.in > mc-wrapper.csh
Index: mc-4.8.30/contrib/mc.sh.in
===================================================================
--- mc-4.8.30.orig/contrib/mc.sh.in
+++ mc-4.8.30/contrib/mc.sh.in
--- a/contrib/mc.sh.in
+++ b/contrib/mc.sh.in
@@ -1,3 +1,10 @@
# Don't define aliases in plain Bourne shell
[ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0

View File

@@ -1,3 +1,121 @@
-------------------------------------------------------------------
Wed Dec 31 01:14:34 UTC 2025 - J Santel <jsantel@automated.computer>
- run obs/service/source_validators/helpers/fix_changelog
-------------------------------------------------------------------
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>
- Add mc-ext-obscpio.patch making mc handle SUSE *.obscpio
archives (bsc#1233006).
-------------------------------------------------------------------
Mon Sep 23 20:12:03 UTC 2024 - Adam Mizerski <adam@mizerski.pl>
- Added patch 4575-fix-wrapper.patch - fixes boo#1203617
-------------------------------------------------------------------
Tue Sep 17 15:04:39 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Update to 4.8.32:
- Core
- Tell the current directory to the terminal using OSC 7 sequence (so it can open new tabs there) (#3088)
- Preserve ext2fs attributes on copy/move operations (#4532)
- Change name of temporary directory: make it unique for each run (#4535)
- Hide password in file operation progress dialog (#4541)
- Support reget in file move operation (#4563)
- Implement nanosecond precision timestamps on non-Linux (macOS, BSD, AIX, Solaris) (#4563)
- Remove remaining mmap code to simplify maintenance (#3960)
- VFS
- extfs: support unrar-7 (#4518)
- Editor
- Improve syntax highlighting:
- C and C++ (MidnightCommander?/mc#195, #4556)
- Viewer
- Diff viewer
- Add man page mcdiff.1 (#4224)
- Misc
- Code cleanup (#4524)
- New skins
- xoria256-thin, xoria256root-thin (#4530)
- modarcon16-defbg-thin, modarcon16-thin, modarcon16root-defbg-thin, modarcon16root-thin (#4530)
- modarin256-defbg-thin, modarin256-thin, modarin256root-defbg-thin, modarin256root-thin (#4530)
- julia256root (#4536)
- mc.ext.ini: clarify escaping of spaces and parenthesis (#4502)
- Fixes
- External editor does not work with arguments in $EDITOR (#4533)
- fish shell: strings " cd (printf '%b' ... " in history (#4521)
- Redundant back slashes for autocomplete (#4292)
- subshell: call execl with argv[0] that is not an actual path to Bash (#4549)
- mcedit: php.syntax: comment highlight from start of light only (#4519)
- mcedit: wrong replacement using regular expressions with begin or end of line (#4525, #4526)
- mcedit: losing column position when navigating up/down (MidnightCommander?/mc#194)
- mcedit: macro deletes text (#4540)
- mcedit: macros are applied to the pasted text (#4562)
- extfs: iso9660: xorriso is slow to open an ISO image (#3570, #4567)
- extfs: u7z: wrong add of nested directories to archive (#4559)
- extfs: segfault on enter to deleted archive (#4560)
- tar: segfault on copy files from archive (#4561)
- man: typo (#4550)
- Remove mc-extfs-iso9660-xorriso.patch patch which doesn't apply anymore.
- Other patches reapplied.
-------------------------------------------------------------------
Mon Mar 18 10:37:48 UTC 2024 - pgajdos@suse.com
@@ -765,8 +883,8 @@ Tue Mar 24 18:45:13 UTC 2015 - astieger@suse.com
+ Better grammar mcedit user menu
* Various bug fixes
-------------------------------------------------------------------
-------------------------------------------------------------------
Sat Sep 6 01:40:44 UTC 2014 - dnh@opensuse.org
- remove file mc-Syntax.cmake.patch / cmds in .spec
@@ -795,6 +913,7 @@ Sat Mar 15 15:35:23 UTC 2014 - dnh@opensuse.org
mc-vfs_fish_helpers_ls-formatstring.diff, thanks to andrew_b
of upstream in mc-ticket:2983
-------------------------------------------------------------------
Sat Mar 15 13:58:42 UTC 2014 - dnh@opensuse.org
- add mc-vfs_fish_helpers_ls-formatstring.diff
@@ -1115,6 +1234,7 @@ Wed Nov 23 09:28:21 UTC 2011 - coolo@suse.com
- add libtool as buildrequire to avoid implicit dependency
-------------------------------------------------------------------
Thu Aug 11 08:44:25 UTC 2011 - vladspbru@gmail.com
- update to 4.7.5.3
@@ -2053,49 +2173,49 @@ Tue Sep 22 17:51:18 MEST 1998 - ro@suse.de
- update to mc 4.1.35 using diff from jurix mirror
merged changes to mc.lib from mc-4.1.11-suse and current (+ibmpc3)
----------------------------------------------------------------------------
-------------------------------------------------------------------
Wed Nov 19 13:01:54 MET 1997 - florian@suse.de
- update to mc 4.1.11
----------------------------------------------------------------------------
-------------------------------------------------------------------
Sun Nov 16 23:10:51 MET 1997 - florian@suse.de
- oops, forgot mc.lib-changes from Werner
----------------------------------------------------------------------------
-------------------------------------------------------------------
Fri Oct 10 13:16:04 MEST 1997 - florian@suse.de
- update to version 4.1.4
----------------------------------------------------------------------------
-------------------------------------------------------------------
Sun Jun 22 18:57:49 MEST 1997 - florian@suse.de
- update to version 4.0
----------------------------------------------------------------------------
-------------------------------------------------------------------
Wed May 28 17:03:24 MET DST 1997 - werner@suse.de
- new mc.lib added
----------------------------------------------------------------------------
-------------------------------------------------------------------
Wed Jan 22 22:24:11 CET 1997 - florian@suse.de
- enable gpm support
----------------------------------------------------------------------------
-------------------------------------------------------------------
Tue Nov 26 20:15:03 CET 1996 - florian@suse.de
- update to version 3.2.11
----------------------------------------------------------------------------
-------------------------------------------------------------------
Mon Sep 2 17:49:41 MET DST 1996 - florian@suse.de
- Es wird nicht mehr mit libgpm-Unterstuetzung kompiliert, da slang
und libgpm sich nicht vertragen. (libgpm laed libncurses, das geht
mit libslang.a nicht...)
----------------------------------------------------------------------
-------------------------------------------------------------------
Sun Aug 25 19:28:50 MET DST 1996 - florian@suse.de
- new version 3.2.7

95
mc.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package mc
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2026 SUSE LLC and contributors
#
# 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.31
Version: 4.8.33
Release: 0
Summary: Midnight Commander
License: GPL-3.0-or-later
@@ -38,9 +38,6 @@ Patch21: mc-extfs-helpers-deb.patch
# add patch. bnc#856501
# http://www.midnight-commander.org/ticket/3128
Patch22: mc-vfs-fish-deleted_source_file.patch
# changed mc-extfs-iso9660-xorriso.patch
# to reflect upstream fix
Patch23: mc-extfs-iso9660-xorriso.patch
#Debian fixes
Patch32: 20_wrong_path_to_wrappers.patch
# PATCH-FIX-UPSTREAM mc-multi-press-f-keys.patch mc287 sbrabec@suse.cz - Fixed Esc + Numeral F-key emulation.
@@ -51,12 +48,14 @@ 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
Patch69: mc-extd-xdg.patch
Patch71: mc-ext-audio.patch
# PATCH-FEATURE-OPENSUSE mc-ext-obscpio.patch bsc#1233006 mcepl@suse.com
# mc can now handle SUSE *.obscpio archives
Patch72: mc-ext-obscpio.patch
Patch100: xls2csv_update.patch
BuildRequires: audiofile-devel
BuildRequires: e2fsprogs-devel
@@ -74,7 +73,6 @@ BuildRequires: pkgconfig(x11)
Requires(pre): permissions
Recommends: %{name}-lang = %{version}
Enhances: fish
Recommends: mkisofs
Recommends: xorriso
%description
@@ -94,25 +92,7 @@ isoinfo (from mkisofs) or xorriso for the iso:// extension.
%prep
echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64` %{SOURCE0}" | sha256sum -c
%setup -q
%patch -P 0
%patch -P 61
%patch -P 62
%patch -P 63
%patch -P 64
%patch -P 69
%patch -P 71 -p1
%patch -P 12 -p1
%patch -P 16
%patch -P 20
%patch -P 21
%patch -P 22 -p1
%patch -P 23
%patch -P 32
%patch -P 41 -p1
%patch -P 42 -p1
%patch -P 52 -p1
%patch -P 100 -p1
%autosetup -p1
%build
%{?!make_build:%define make_build make -O %_smp_mflags V=1 VERBOSE=1}
@@ -144,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} \
@@ -167,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
@@ -190,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
@@ -199,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
@@ -220,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

View File

@@ -2,14 +2,18 @@ Author: Adam Majer
Upstream: http://midnight-commander.org/ticket/3912
Bugzilla: 1087708
Index: mc-4.8.26/misc/ext.d/doc.sh.in
---
misc/ext.d/doc.sh.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: mc-4.8.33/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
--- 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