Accepting request 43747 from home:walery

Copy from home:walery/mc via accept of submit request 43747 revision 57.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/43747
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=12
This commit is contained in:
Cristian Rodríguez 2010-07-22 16:44:27 +00:00 committed by Git OBS Bridge
parent bdfdad3702
commit c83437be47
27 changed files with 387 additions and 7278 deletions

View File

@ -1,13 +0,0 @@
Index: lib/vfs/mc-vfs/ftpfs.c
===================================================================
--- lib/vfs/mc-vfs/ftpfs.c.orig 2010-07-05 21:12:51.000000000 +0200
+++ lib/vfs/mc-vfs/ftpfs.c 2010-07-07 11:52:54.995011197 +0200
@@ -1669,7 +1669,7 @@ static int ftpfs_chmod (struct vfs_class
g_snprintf(buf, sizeof(buf), "SITE CHMOD %4.4o /%%s", mode & 07777);
- ret = ftpfs_send_command(me, path, buf, OPT_FLUSH);
+ ret = ftpfs_send_command(me, path, buf, OPT_FLUSH | OPT_IGNORE_ERROR);
if ( mc_config_get_bool (mc_main_config, CONFIG_APP_SECTION,
"ignore_ftp_chattr_errors", TRUE)) {

View File

@ -1,13 +0,0 @@
Description: Add gem extension
--- misc/mc.ext.in
+++ misc/mc.ext.in
@@ -107,7 +107,7 @@
### Archives ###
# .tgz, .tpz, .tar.gz, .tar.z, .tar.Z, .ipk
-regex/\.t([gp]?z|ar\.g?[zZ])$|\.ipk$
+regex/\.t([gp]?z|ar\.g?[zZ])$|\.ipk|\.gem$
Open=%cd %p#utar
View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -

View File

@ -1,16 +0,0 @@
Description: Fix fails to display zip file contents after unzip update
Bug-Debian: http://bugs.debian.org/528239
Author: Johannes Stezenbach <js@sig21.net>
Author: Yury V. Zaytsev <yury@shurup.com>
--- lib/vfs/mc-vfs/extfs/uzip.in 2010-02-25 11:51:39.000000000 +0100
+++ lib/vfs/mc-vfs/extfs/uzip.in 2010-03-17 10:43:37.000000000 +0100
@@ -19,7 +19,7 @@
# Location of the unzip program
my $app_unzip = "@UNZIP@";
# Set this to 1 if zipinfo (unzip -Z) is to be used (recommended), otherwise 0.
-my $op_has_zipinfo = @HAVE_ZIPINFO@;
+my $op_has_zipinfo = 1;
# Command used to list archives (zipinfo mode)
my $cmd_list_zi = "$app_unzip -Z -l -T";

View File

@ -1,25 +0,0 @@
Description: Fix wrong path to the wrapper script
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/bin/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
SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkglibexecdir = $(datadir)/@PACKAGE@
cfgdir = $(sysconfdir)/@PACKAGE@
cfg_DATA = \

View File

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

3
mc-4.7.3.tar.bz2 Normal file
View File

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

View File

@ -1,119 +0,0 @@
Index: misc/mc.ext.in
===================================================================
--- misc/mc.ext.in.orig 2010-07-05 21:12:51.000000000 +0200
+++ misc/mc.ext.in 2010-07-06 18:46:11.131015545 +0200
@@ -115,7 +115,7 @@ regex/\.tar\.bz$
# Open=%cd %p#utar
View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -
-regex/\.t(ar\.bz2|bz2?|b2)$
+regex/\.t(ar\.bz2|bz2?|b2|bz2)$
Open=%cd %p#utar
View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
@@ -391,7 +391,7 @@ shell/.ico
Include=image
include/image
- Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
+ Open=if [ "$DISPLAY" = "" ]; then asciiview %f; else (display %f >/dev/null 2>&1 &); fi
View=%view{ascii} identify %f
#View=%view{ascii} asciiview %f
@@ -409,11 +409,11 @@ regex/\.([wW][aA][wW]22)$
Open=vplay -s 22 %f
regex/\.([mM][pP]3)$
- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else if [ -z "`which realplay`" ]; then (xmms -e %f 1>/dev/null 2>&1 &); else (realplay %f >/dev/null 2>&1 &); fi; fi
View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
regex/\.([oO][gG][gG|aA|vV|xX])$
- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi
View=%view{ascii} ogginfo %s
regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
@@ -478,12 +478,12 @@ include/video
# Postscript
type/^PostScript
- Open=(gv %f &)
+ Open=(gv %f >/dev/null 2>&1 &)
View=%view{ascii} ps2ascii %f
# PDF
type/^PDF
- Open=(xpdf %f &)
+ Open=(xpdf %f >/dev/null 2>&1 &)
#Open=(acroread %f &)
#Open=(ghostview %f &)
View=%view{ascii} pdftotext %f -
@@ -498,48 +498,44 @@ regex/\.([hH][tT][mM][lL]?)$
# StarOffice 5.2
shell/.sdw
- Open=(ooffice %f &)
+ Open=(ooffice %f >/dev/null 2>&1 &)
# StarOffice 6 and OpenOffice.org formats
-regex/\.(odt|ott|sxw|stw|ods|ots|sxc|stc|odp|otp|sxi|sti|odg|otg|sxd|std|odb|odf|sxm|odm|sxg)$
- Open=(ooffice %f &)
+regex/\.(odb|odc|odf|odg|odi|odm|odp|ods|odt|otg|oth|otp|ots|ott|sda|sdc|sdd|sdp|sds|sdw|sgl|smf|stc|std|sti|stw|sxc|sxd|sxg|sxi|sxm|sxw|vor)$
+ Open=(ooffice %f >/dev/null 2>&1 &)
View=%view{ascii} odt2txt %f
# AbiWord
shell/.abw
- Open=(abiword %f &)
+ Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
# Microsoft Word Document
regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
- Open=(abiword %f >/dev/null 2>&1 &)
+ Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
type/^Microsoft\ Word
- Open=(abiword %f >/dev/null 2>&1 &)
+ Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
# RTF document
regex/\.([rR][tT][fF])$
- Open=(abiword %f >/dev/null 2>&1 &)
+ Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
# Microsoft Excel Worksheet
regex/\.([xX][lL][sSwW])$
- Open=(gnumeric %f >/dev/null 2>&1 &)
+ Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
View=%view{ascii} xls2csv %f || strings %f
type/^Microsoft\ Excel
- Open=(gnumeric %f >/dev/null 2>&1 &)
+ Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
View=%view{ascii} xls2csv %f || strings %f
-# Use OpenOffice.org to open any MS Office documents
-type/^Microsoft\ Office\ Document
- Open=(ooffice %f &)
-
# Framemaker
type/^FrameMaker
Open=fmclient -f %f
# DVI
regex/\.([dD][vV][iI])$
- Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f &); fi
+ Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f >/dev/null 2>&1 &); fi
View=%view{ascii} dvi2tty %f
# TeX
@@ -548,7 +544,7 @@ regex/\.([Tt][Ee][Xx])$
# DjVu
regex/\.(djvu|DJVU)$
- Open=djview %f &
+ Open=djview %f >/dev/null 2>&1 &
### Miscellaneous ###

View File

@ -1,13 +0,0 @@
Index: lib/util.c
===================================================================
--- lib/util.c.orig 2010-07-05 21:12:51.000000000 +0200
+++ lib/util.c 2010-07-06 19:19:06.919536838 +0200
@@ -853,6 +853,8 @@ strip_ctrl_codes (char *s)
/* strchr() matches trailing binary 0 */
while (*(++r) && strchr ("0123456789;?", *r));
}
+ else if (*r == '(')
+ r++;
else if (*r == ']')
{
/*

View File

@ -1,137 +0,0 @@
Index: configure.ac
===================================================================
--- configure.ac.orig 2010-07-05 21:12:51.000000000 +0200
+++ configure.ac 2010-07-07 14:39:08.919511437 +0200
@@ -71,7 +71,7 @@ AC_PROG_LN_S
AC_CHECK_TOOL(AR, ar, ar)
dnl Only list browsers here that can be run in background (i.e. with `&')
-AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape])
+AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape])
dnl
dnl Ovverriding mmap support. This has to be before AC_FUNC_MMAP is used.
Index: misc/mc.ext.in
===================================================================
--- misc/mc.ext.in.orig 2010-07-07 14:39:08.723510066 +0200
+++ misc/mc.ext.in 2010-07-07 14:55:35.231010197 +0200
@@ -226,8 +226,8 @@ regex/\.rpm$
# deb
regex/\.u?deb$
- Open=%cd %p#deb
- View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
+ Open=%cd %p#uar
+ View=%view{ascii} file %f && nm %f
# dpkg
shell/.debd
@@ -399,7 +399,8 @@ include/image
### Sound files ###
regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
- Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
+ Include=audio
+# Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
Open=mikmod %f
@@ -409,15 +410,22 @@ regex/\.([wW][aA][wW]22)$
Open=vplay -s 22 %f
regex/\.([mM][pP]3)$
- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else if [ -z "`which realplay`" ]; then (xmms -e %f 1>/dev/null 2>&1 &); else (realplay %f >/dev/null 2>&1 &); fi; fi
- View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
+ Include=audio
+# Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else if [ -z "`which realplay`" ]; then (xmms -e %f 1>/dev/null 2>&1 &); else (realplay %f >/dev/null 2>&1 &); fi; fi
+# View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
+
+regex/\.([mM][kK][aA])$
+ Include=audio
regex/\.([oO][gG][gG|aA|vV|xX])$
- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi
+ Include=audio
+# Open=ogg123 %f
+# Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi
View=%view{ascii} ogginfo %s
regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
- Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
+ Include=audio
+# Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
Open=timidity %f
@@ -426,11 +434,15 @@ regex/\.([wW][mM][aA])$
Open=mplayer -vo null %f
View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
+include/audio
+ Open=mplayer %f
+ View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p'
### Play lists ###
regex/\.([mM]3[uU]|[pP][lL][sS])$
- Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
+ Open=mplayer -vo null -playlist %f
+# Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
### Video ###
@@ -478,12 +490,12 @@ include/video
# Postscript
type/^PostScript
- Open=(gv %f >/dev/null 2>&1 &)
+ Open=(xdg-open %f >/dev/null 2>&1 &)
View=%view{ascii} ps2ascii %f
# PDF
type/^PDF
- Open=(xpdf %f >/dev/null 2>&1 &)
+ Open=(xdg-open %f >/dev/null 2>&1 &)
#Open=(acroread %f &)
#Open=(ghostview %f &)
View=%view{ascii} pdftotext %f -
@@ -511,27 +523,33 @@ shell/.abw
# Microsoft Word Document
type/^Microsoft\ Office\ Document
- Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
+ Open=(xdg-open %f &)
+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
View=%view{ascii} wvText %f - || strings %f
type/^Microsoft\ Word
- Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
+ Open=(xdg-open %f &)
+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
View=%view{ascii} wvText %f - || strings %f
regex/\.([Dd]ot|DOT|[Ww]ri|WRI)$
- Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (OOo %f >/dev/null 2>&1 &); fi >/dev/null
+ Open=(xdg-open %f &)
+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (OOo %f >/dev/null 2>&1 &); fi >/dev/null
View=%view{ascii} wvText %f - || strings %f
# RTF document
regex/\.([rR][tT][fF])$
- Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
+ Open=(xdg-open %f &)
+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
# Microsoft Excel Worksheet
regex/\.([xX][lL][sSwW])$
- Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
+ Open=(xdg-open %f &)
+# Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
View=%view{ascii} xls2csv %f || strings %f
type/^Microsoft\ Excel
- Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
+ Open=(xdg-open %f &)
+# Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
View=%view{ascii} xls2csv %f || strings %f
# Framemaker

View File

@ -1,16 +0,0 @@
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
@@ -273,6 +273,11 @@ static key_define_t xterm_key_defines[]
{KEY_F (9), ESC_STR "[20~", MCKEY_NOACTION},
{KEY_F (10), ESC_STR "[21~", MCKEY_NOACTION},
+ { KEY_M_SHIFT | KEY_F(1), ESC_STR "[1;2P", MCKEY_NOACTION },
+ { KEY_M_SHIFT | KEY_F(2), ESC_STR "[1;2Q", MCKEY_NOACTION },
+ { KEY_M_SHIFT | KEY_F(3), ESC_STR "[1;2R", MCKEY_NOACTION },
+ { KEY_M_SHIFT | KEY_F(4), ESC_STR "[1;2S", MCKEY_NOACTION },
+
/* old xterm Shift-arrows */
{KEY_M_SHIFT | KEY_UP, ESC_STR "O2A", MCKEY_NOACTION},
{KEY_M_SHIFT | KEY_DOWN, ESC_STR "O2B", MCKEY_NOACTION},

View File

@ -1,70 +0,0 @@
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], [
fi
if test x"$ac_ncurses_lib_path" != x; then
- ac_ncurses_lib_path="-L"$ac_ncurses_lib_path
+ case $ac_ncurses_lib_path in
+ /usr/lib*)
+ ac_ncurses_lib_path=""
+ ;;
+ *)
+ ac_ncurses_lib_path="-L"$ac_ncurses_lib_path
+ ;;
+ esac
fi
saved_CPPFLAGS="$CPPFLAGS"
@@ -30,9 +37,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
- if test x"$ac_ncurses_lib_path" = x; then
- ac_ncurses_lib_path="-L/usr/lib"
- fi
found_ncurses=yes
AC_DEFINE(HAVE_NCURSES_NCURSES_H, 1,
[Define to 1 if you have the <ncurses/ncurses.h> header file.])
Index: m4.include/mc-with-screen-slang.m4
===================================================================
--- m4.include/mc-with-screen-slang.m4.orig 2010-07-05 21:12:51.000000000 +0200
+++ m4.include/mc-with-screen-slang.m4 2010-07-07 17:20:13.630862000 +0200
@@ -31,7 +31,14 @@ AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
fi
if test x"$param_slang_lib_path" != x; then
- ac_slang_lib_path="-L"$param_slang_lib_path
+ case $ac_ncurses_lib_path in
+ /usr/lib*)
+ ac_ncurses_lib_path=""
+ ;;
+ *)
+ ac_slang_lib_path="-L"$param_slang_lib_path
+ ;;
+ esac
fi
saved_CFLAGS="$CFLAGS"
@@ -51,9 +58,6 @@ AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
if test x"$ac_slang_inc_path" = x; then
ac_slang_inc_path="-I/usr/include"
fi
- if test x"$ac_slang_lib_path" = x; then
- ac_slang_lib_path="-L/usr/lib"
- fi
found_slang=yes
AC_DEFINE(HAVE_SLANG_H, 1,[Define to use slang.h])
@@ -68,9 +72,6 @@ AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
if test x"$ac_slang_inc_path" = x; then
ac_slang_inc_path="-I/usr/include"
fi
- if test x"$ac_slang_lib_path" = x; then
- ac_slang_lib_path="-L/usr/lib"
- fi
CFLAGS="-DHAVE_SLANG_SLANG_H $CFLAGS"
fi
],

View File

@ -1,31 +0,0 @@
Index: lib/tty/color.c
===================================================================
--- lib/tty/color.c.orig 2010-07-05 21:12:51.000000000 +0200
+++ lib/tty/color.c 2010-07-09 12:15:45.223012470 +0200
@@ -85,7 +85,7 @@ tty_color_free_condition_cb (gpointer ke
tty_color_pair_t *mc_color_pair;
(void) key;
- is_temp_color = (gboolean) user_data;
+ is_temp_color = (gboolean) GINT_TO_POINTER(user_data);
mc_color_pair = (tty_color_pair_t *) value;
return (mc_color_pair->is_temp == is_temp_color);
}
@@ -96,7 +96,7 @@ static void
tty_color_free_all (gboolean is_temp_color)
{
g_hash_table_foreach_remove (mc_tty_color__hashtable, tty_color_free_condition_cb,
- (gpointer) is_temp_color);
+ GINT_TO_POINTER(is_temp_color));
}
/* --------------------------------------------------------------------------------------------- */
@@ -108,7 +108,7 @@ tty_color_get_next_cpn_cb (gpointer key,
tty_color_pair_t *mc_color_pair;
(void) key;
- cp = (int) user_data;
+ cp = GPOINTER_TO_INT(user_data);
mc_color_pair = (tty_color_pair_t *) value;
if (cp == mc_color_pair->pair_index)

View File

@ -1,13 +0,0 @@
Index: src/editor/editwidget.c
===================================================================
--- src/editor/editwidget.c.orig 2010-07-05 21:12:51.000000000 +0200
+++ src/editor/editwidget.c 2010-07-07 15:31:11.479082454 +0200
@@ -271,7 +271,7 @@ edit_file (const char *_file, int line)
const char *
edit_get_file_name (const WEdit *edit)
{
- return edit->filename;
+ return edit?edit->filename:NULL;
}
void

View File

@ -1,58 +0,0 @@
http://www.midnight-commander.org/ticket/287
Index: lib/tty/key.c
===================================================================
--- lib/tty/key.c.orig 2010-07-07 17:32:15.521891000 +0200
+++ lib/tty/key.c 2010-07-07 17:32:15.897891000 +0200
@@ -897,10 +897,13 @@ correct_key_code (int code)
mod = 0;
}
- /* F0 is the same as F10 for out purposes */
+ /* F0 is the same as F10 for our purposes */
if (c == KEY_F (0))
c = KEY_F (10);
+ if (c == KEY_F_IMMUTABLE (0))
+ c = KEY_F_IMMUTABLE (10);
+
/*
* We are not interested if Ctrl was pressed when entering control
* characters, so assume that it was. When checking for such keys,
@@ -965,6 +968,16 @@ correct_key_code (int code)
mod &= ~KEY_M_SHIFT;
}
+ /*
+ * Numerals may require modifilers with some keymaps or on obscure
+ * keyboards (e. g. F4 = Esc Shift+4). We have to ignore all
+ * modifiers while interpreting Esc + Numeral.
+ */
+ if (c >= KEY_F_IMMUTABLE (1) && c <= KEY_F_IMMUTABLE (10)) {
+ c += KEY_F (0) - KEY_F_IMMUTABLE (0);
+ mod &= ~KEY_M_MASK;
+ }
+
if (!alternate_plus_minus)
switch (c) {
case KEY_KP_ADD:
@@ -1613,7 +1626,7 @@ get_key_code (int no_delay)
if ((parent != NULL) && (parent->action == MCKEY_ESCAPE)) {
/* Convert escape-digits to F-keys */
if (g_ascii_isdigit (c))
- c = KEY_F (c - '0');
+ c = KEY_F_IMMUTABLE (c - '0');
else if (c == ' ')
c = ESC_CHAR;
else
Index: lib/tty/tty-slang.h
===================================================================
--- lib/tty/tty-slang.h.orig 2010-07-05 21:12:51.000000000 +0200
+++ lib/tty/tty-slang.h 2010-07-07 17:33:45.962779000 +0200
@@ -16,6 +16,7 @@ enum {
};
#define KEY_F(x) (1000 + x)
+#define KEY_F_IMMUTABLE(x) (970+x)
#define ACS_VLINE SLSMG_VLINE_CHAR
#define ACS_HLINE SLSMG_HLINE_CHAR

View File

@ -1,38 +0,0 @@
Index: misc/mc.menu
===================================================================
--- misc/mc.menu.orig 2010-07-05 21:12:51.000000000 +0200
+++ misc/mc.menu 2010-07-06 18:50:29.444518504 +0200
@@ -222,6 +222,33 @@ U Uudecode marked news articles (n
fi
echo "Please test the output file before deleting anything."
++ & t r & ! t t
+m Install as MEMO on palm pilot
+ echo "Installing MEMO..."
+ install-memo %f
+
+=+ f \.pdb$ | f \.prc$ | f \.pqa$ | f \.PDB$ | f \.PRC$ | f \.PQA$ & t r & ! t t
+p Install on palm pilot (programs or databases)
+ echo "Installing file on PALM"
+ pilot-xfer -i %f
+
++ t t
+M Install tagged files as MEMOs on palm pilot
+ for i in %t
+ do
+ echo "Installing MEMO: $i"
+ done
+ install-memo -t %t
+
++ t t
+P Install tagged files on palm pilot (programs or databases)
+ echo "Installing files on PALM"
+ for i in %t
+ do
+ echo "Installing file: $i"
+ done
+ pilot-xfer -i %t
+
=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.lz$ | f \.tar\.lzma$ | f \.tar\.7z$ | f \.tar\.xz$ | f \.tar\.Z$ | f \.tar\.bz2$ & t r
x Extract the contents of a compressed tar file
unset PRG

View File

@ -1,58 +0,0 @@
Index: misc/syntax/spec.syntax
===================================================================
--- misc/syntax/spec.syntax.orig 2010-07-05 21:12:51.000000000 +0200
+++ misc/syntax/spec.syntax 2010-07-06 19:24:41.303406337 +0200
@@ -12,6 +12,7 @@ context default
keyword whole Description: green
keyword whole Distribution: green
keyword whole Doc\{Dd\}ir: green
+ keyword whole Enhances: green
keyword whole Epoch: green
keyword whole Exclude\{Aa\}rch: green
keyword whole Exclusive\{Aa\}rch: green
@@ -27,6 +28,7 @@ context default
keyword whole Prefix: green
keyword whole Pre\{Rr\}eq: green
keyword whole Provides: green
+ keyword whole Recommends: green
keyword whole Release: green
keyword whole Requires: green
keyword whole Requires(\[abcdefghijklmnopqrstuvwxyz\]): green
@@ -35,6 +37,7 @@ context default
keyword whole Source\[0123456789\]: green
keyword whole Suggests: green
keyword whole Summary: green
+ keyword whole Supplements: green
keyword whole Vendor: green
keyword whole Version: green
keyword whole U\{Rr\}\{Ll\}: green
Index: lib/vfs/mc-vfs/extfs/rpm
===================================================================
--- lib/vfs/mc-vfs/extfs/rpm.orig 2010-07-05 21:12:51.000000000 +0200
+++ lib/vfs/mc-vfs/extfs/rpm 2010-07-07 11:31:08.411018868 +0200
@@ -154,8 +154,14 @@ mcrpmfs_list_fastRPM ()
echo "$FILEPREF 0 $DATE INFO/EPOCH"
echo "$FILEPREF 0 $DATE INFO/LICENSE"
echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
+ echo "$FILEPREF 0 $DATE INFO/ENHANCES"
+ echo "$FILEPREF 0 $DATE INFO/SUGGESTS"
echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
echo "$FILEPREF 0 $DATE INFO/PROVIDES"
+ echo "$FILEPREF 0 $DATE INFO/ENHANCES"
+ echo "$FILEPREF 0 $DATE INFO/SUGGESTS"
+ echo "$FILEPREF 0 $DATE INFO/RECOMMENDS"
+ echo "$FILEPREF 0 $DATE INFO/SUPPLEMENTS"
echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
}
@@ -273,6 +279,10 @@ mcrpmfs_copyout ()
INFO/LICENSE) mcrpmfs_getOneTag "LICENSE" >"$2"; exit 0;;
INFO/RPMVERSION) mcrpmfs_getRawOneTag "%{RPMVERSION}\n" >"$2"; exit 0;;
INFO/REQUIRENAME) mcrpmfs_getRawOneTag "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" >"$2"; exit 0;;
+ INFO/ENHANCES) mcrpmfs_getRawOneTag "[%|ENHANCESFLAGS:depflag_strong?{}:{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" "$f" >"$3"; exit 0;;
+ INFO/SUGGESTS) mcrpmfs_getRawOneTag "[%|SUGGESTSFLAGS:depflag_strong?{}:{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" "$f" >"$3"; exit 0;;
+ INFO/RECOMMENDS) mcrpmfs_getRawOneTag "[%|SUGGESTSFLAGS:depflag_strong?{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" "$f" >"$3"; exit 0;;
+ INFO/SUPPLEMENTS) mcrpmfs_getRawOneTag "[%|ENHANCESFLAGS:depflag_strong?{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" "$f" >"$3"; exit 0;;
INFO/PROVIDES) mcrpmfs_getRawOneTag "[%{PROVIDES}\n]" >"$2"; exit 0;;
INFO/SCRIPTS/PREIN) mcrpmfs_getRawOneTag "%{RPMTAG_PREIN}\n" >"$2"; exit 0;;
INFO/SCRIPTS/POSTIN) mcrpmfs_getRawOneTag "%{RPMTAG_POSTIN}\n" >"$2"; exit 0;;

View File

@ -1,13 +0,0 @@
Index: misc/syntax/Syntax
===================================================================
--- misc/syntax/Syntax.orig 2010-07-05 21:12:51.000000000 +0200
+++ misc/syntax/Syntax 2010-07-06 19:13:17.207010626 +0200
@@ -85,7 +85,7 @@ include texinfo.syntax
file ..\*\\.c$ C\sProgram
include c.syntax
-file ..\*\\.([hC]|CC|cxx|cc|cpp|CPP|CXX|hxx|hh|hpp|h\.in)$ C/C\+\+\sProgram
+file ..\*\\.([hC]|CC|cxx|cc|cpp|CPP|CXX|hxx|hh|hpp|HPP|h\.in)$ C/C\+\+\sProgram
include cxx.syntax
file ..\*\\.d$ D\sProgram

File diff suppressed because it is too large Load Diff

View File

@ -1,25 +0,0 @@
Index: misc/mc.ext.in
===================================================================
--- misc/mc.ext.in.orig 2010-07-06 18:51:59.439510211 +0200
+++ misc/mc.ext.in 2010-07-06 18:54:56.647019263 +0200
@@ -510,12 +510,17 @@ shell/.abw
Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
# Microsoft Word Document
-regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
+type/^Microsoft\ Office\ Document
Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
- View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
+ View=%view{ascii} wvText %f - || strings %f
+
type/^Microsoft\ Word
Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
- View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
+ View=%view{ascii} wvText %f - || strings %f
+
+regex/\.([Dd]ot|DOT|[Ww]ri|WRI)$
+ Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (OOo %f >/dev/null 2>&1 &); fi >/dev/null
+ View=%view{ascii} wvText %f - || strings %f
# RTF document
regex/\.([rR][tT][fF])$

View File

@ -1,16 +0,0 @@
Index: contrib/mc.sh.in
===================================================================
--- contrib/mc.sh.in.orig 2010-07-05 21:12:51.000000000 +0200
+++ contrib/mc.sh.in 2010-07-06 19:10:33.155018811 +0200
@@ -1,3 +1,10 @@
# Don't define aliases in plain Bourne shell
[ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0
-alias mc='. @pkglibexecdir@/mc-wrapper.sh'
+mc()
+{
+. @datadir@/mc/mc-wrapper.sh'
+}
+if [ -n "$BASH_VERSION" ]
+then
+ export -f mc
+fi

View File

@ -1,15 +0,0 @@
Index: misc/mc.ext.in
===================================================================
--- misc/mc.ext.in.orig 2010-07-06 18:56:05.000000000 +0200
+++ misc/mc.ext.in 2010-07-06 18:56:56.835018761 +0200
@@ -493,8 +493,8 @@ type/^PDF
# html
regex/\.([hH][tT][mM][lL]?)$
- Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
- View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f
+ Open=/usr/share/mc/bin/x11_browser %f
+ View=%view{ascii} w3m -dump -T text/html %f;
# StarOffice 5.2
shell/.sdw

View File

@ -1,927 +0,0 @@
-------------------------------------------------------------------
Tue Jul 13 11:57:31 CEST 2010 - pth@suse.de
- Fix pointer <-> int casts.
- Install x11_browser to _datadir/mc.
-------------------------------------------------------------------
Thu Mar 18 07:35:09 UTC 2010 - prusnak@suse.cz
- little cleanup
-------------------------------------------------------------------
Sun Oct 11 10:16:07 UTC 2009 - mseben@novell.com
- added mc-mkdir_mc_home.patch - create .mc home dir at startup (bnc#533262)
-------------------------------------------------------------------
Mon Jul 13 21:22:27 CEST 2009 - coolo@novell.com
- only things that can be split into bundles can go into -lang
- do not require but recommend the -lang package
-------------------------------------------------------------------
Wed May 20 14:47:14 CEST 2009 - nadvornik@suse.cz
- really apply 05_add_lzma_xz_support.patch
-------------------------------------------------------------------
Wed May 6 16:17:17 CEST 2009 - nadvornik@suse.cz
- fixed crash in utf-8 patch [bnc#500516]
- allow to specify port number in the shell link [bnc#483249]
-------------------------------------------------------------------
Thu Mar 12 16:35:18 CET 2009 - prusnak@suse.cz
- added xz support (05_add_lzma_xz_support.patch)
-------------------------------------------------------------------
Wed Feb 25 16:45:41 CET 2009 - sbrabec@suse.cz
- Fixed Esc + Numeral F-key emulation (mc#287).
- Convert Serbian files to UTF-8.
- UTF-8 conversion moved to %prep.
- Locale specific files moved to -lang package.
-------------------------------------------------------------------
Thu Feb 12 14:42:05 CET 2009 - nadvornik@suse.cz
- updated to final 4.6.2:
* many patches mentioned bellow were included upstream
-------------------------------------------------------------------
Thu Nov 27 11:14:29 CET 2008 - nadvornik@suse.cz
- added desktop file [bnc#434809]
-------------------------------------------------------------------
Thu Oct 9 11:57:28 CEST 2008 - nadvornik@suse.cz
- fixed dynamic loading of X11 library
[http://savannah.gnu.org/bugs/index.php?24505]
-------------------------------------------------------------------
Tue Sep 9 18:05:39 CEST 2008 - nadvornik@suse.cz
- added bugfixes from upstream cvs and from debian package for
* preserve Attributes checkbox [bnc#419832]
* fish filesystem [bnc#400515]
* regexp matching
* lzma support [bnc#400388]
* other fixes and improvements
- fixed information displayed for rpm files [bnc#410704]
- partialy fixed SHIFT-Fn key behavior [bnc#400552]
-------------------------------------------------------------------
Mon Mar 31 18:30:47 CEST 2008 - nadvornik@suse.cz
- fixed cursor appearance on visible tabs
-------------------------------------------------------------------
Mon Nov 5 13:31:25 CET 2007 - nadvornik@suse.cz
- updated to 4.6.2-pre1
* improved subshell handling
* improved fish filesystem
* a lot of other fixes and enhancements
- updated UTF-8 patches using Fedora package
- added support for weak rpm dependencies in VFS
-------------------------------------------------------------------
Tue Aug 28 16:38:08 CEST 2007 - nadvornik@suse.cz
- link duplicate files only inside /usr [#304167]
-------------------------------------------------------------------
Sat Aug 11 10:49:20 CEST 2007 - olh@suse.de
- remove umode_t checks
use offsetof() in vfs-impl.h
build parallel
move iconv updates to build section to fix quilt setup -v *.spec
-------------------------------------------------------------------
Tue Aug 7 23:54:20 CEST 2007 - maw@suse.de
- Use %fdupes
- Split off a -lang subpackage.
-------------------------------------------------------------------
Tue Jul 17 17:03:06 CEST 2007 - nadvornik@suse.cz
- fixed terminal escape sequences parsing (#253401)
-------------------------------------------------------------------
Mon Apr 2 14:45:10 CEST 2007 - rguenther@suse.de
- add gpm BuildRequires
-------------------------------------------------------------------
Mon Jan 15 16:32:49 CET 2007 - nadvornik@suse.cz
- fixed special characters quoting for bash 3.2 [#232411]
-------------------------------------------------------------------
Wed Oct 4 15:34:51 CEST 2006 - nadvornik@suse.cz
- built with --with-samba [#207643]
- fixed displaying of nlink column in utf8 mode [#194715]
- spec file cleanup [#194392]
-------------------------------------------------------------------
Wed Jun 7 12:30:32 CEST 2006 - nadvornik@suse.cz
- fixes for Slang2 [#177920, #176327]
-------------------------------------------------------------------
Tue Apr 18 15:03:49 CEST 2006 - schwab@suse.de
- Revert last change, kernel headers have been fixed.
-------------------------------------------------------------------
Tue Apr 18 13:09:49 CEST 2006 - nadvornik@suse.cz
- fixed check for umode_t; it fixes compilation on ppc64
-------------------------------------------------------------------
Fri Apr 7 12:28:29 CEST 2006 - lmichnovic@suse.cz
- adjusted ogg file opening (updated apps.patch)
-------------------------------------------------------------------
Mon Mar 13 15:50:32 CET 2006 - nadvornik@suse.cz
- make sure that backgrounded applications do not write
to terminal [#153178]
- use realplay if available
- recognize .hpp files
-------------------------------------------------------------------
Tue Mar 7 19:28:34 CET 2006 - lmichnovic@suse.cz
- fixed bash specific syntax in /etc/profile.d/mc.sh [#155644]
(updated wrapper.patch)
- changed default application to open images with from xv to display
(updated apps.patch)
-------------------------------------------------------------------
Thu Feb 9 17:23:10 CET 2006 - nadvornik@suse.cz
- fixed switching long panels [143265]
- fixed crash on error in getpwuid
-------------------------------------------------------------------
Tue Feb 7 01:55:08 CET 2006 - ro@suse.de
- fix build for < 10.1
-------------------------------------------------------------------
Fri Jan 27 02:12:15 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Tue Jan 24 16:55:56 CET 2006 - nadvornik@suse.cz
- used exported bash function in mc wrapper [#127769]
- fixed crash during renaming UTF-8 filenames [#131997]
-------------------------------------------------------------------
Thu Jan 12 16:31:10 CET 2006 - nadvornik@suse.cz
- compile with -fstack-protector
-------------------------------------------------------------------
Wed Oct 12 14:04:16 CEST 2005 - nadvornik@suse.cz
- added patch for slang2
-------------------------------------------------------------------
Wed Aug 10 11:15:24 CEST 2005 - nadvornik@suse.cz
- added .tbz2 and .djvu extension [fixes #98447]
-------------------------------------------------------------------
Mon Aug 1 14:34:19 CEST 2005 - nadvornik@suse.cz
- updated to final 4.6.1
-------------------------------------------------------------------
Thu Apr 14 17:17:06 CEST 2005 - sbrabec@suse.cz
- Added audiofile-devel to neededforbuild.
-------------------------------------------------------------------
Mon Mar 7 12:20:39 CET 2005 - nadvornik@suse.cz
- updated external applications
-------------------------------------------------------------------
Mon Jan 24 10:21:20 CET 2005 - meissner@suse.de
- 0 -> NULL in one glib call.
-------------------------------------------------------------------
Fri Jan 21 12:39:04 CET 2005 - nadvornik@suse.cz
- updated to 4.6.1-pre3
-------------------------------------------------------------------
Fri Nov 12 14:36:08 CET 2004 - ro@suse.de
- correct permissions handling for /usr/lib/mc/cons.saver
-------------------------------------------------------------------
Sat Oct 23 15:48:38 CEST 2004 - mmj@suse.de
- rename no til nb
-------------------------------------------------------------------
Fri Sep 10 11:59:41 CEST 2004 - nadvornik@suse.cz
- fixed quoting in extfs script CAN-2004-0494 [#43151]
- fixed show_output_starts_shell option [#44777]
- fixed mcedit crash [#43178]
-------------------------------------------------------------------
Wed Jun 30 12:28:00 CEST 2004 - nadvornik@suse.cz
- many fixes in UTF8 patches
- fixed freeze on rar archives with password [#41591]
- allow large screen size [#41475]
-------------------------------------------------------------------
Fri Apr 23 12:16:56 CEST 2004 - nadvornik@suse.cz
- fixed various buffer overflows and temp file handling [#38577]
- fixed crash on broken UTF-8 characters in directory name [#39309]
-------------------------------------------------------------------
Wed Mar 31 17:12:28 CEST 2004 - nadvornik@suse.cz
- fixed sort options in mc-posix_options.diff
-------------------------------------------------------------------
Wed Mar 31 11:08:02 CEST 2004 - nadvornik@suse.cz
- do not strip UTF-8 characters from prompt and xterm title [#37542]
-------------------------------------------------------------------
Thu Mar 25 15:28:13 CET 2004 - nadvornik@suse.cz
- fixed crash with NULL return from getpwuid [#36867]
-------------------------------------------------------------------
Thu Mar 18 15:24:29 CET 2004 - nadvornik@suse.cz
- fixed another crash in slang
-------------------------------------------------------------------
Mon Mar 15 12:16:16 CET 2004 - nadvornik@suse.cz
- fixed external applications
-------------------------------------------------------------------
Thu Mar 11 12:11:15 CET 2004 - nadvornik@suse.cz
- better fix for the crash is slang
- various fixes in utf8 patch
-------------------------------------------------------------------
Tue Mar 09 11:33:34 CET 2004 - nadvornik@suse.cz
- fixed crash if TERM is unset
- fixed viewing files in tar archives
-------------------------------------------------------------------
Mon Mar 08 17:41:36 CET 2004 - nadvornik@suse.cz
- fixed forward/backward word functions in utf8 patch
-------------------------------------------------------------------
Fri Mar 05 18:51:45 CET 2004 - nadvornik@suse.cz
- fixes in utf8 patches
- do not let XOpenDisplay exit [#31960]
-------------------------------------------------------------------
Mon Mar 01 17:55:14 CET 2004 - nadvornik@suse.cz
- added utf8 support in commandline, viewer and editor
-------------------------------------------------------------------
Wed Feb 18 17:42:19 CET 2004 - sbrabec@suse.cz
- Added all available UTF-8 patches (mostly from from Jakub Jelinek
<jakub@redhat.com>).
-------------------------------------------------------------------
Sat Jan 10 12:54:19 CET 2004 - adrian@suse.de
- build as user
-------------------------------------------------------------------
Thu Jan 8 12:14:26 CET 2004 - pthomas@suse.de
- Fix the handling of symlinks inside tarballs which would lead
to a segfault with suitably constructed tarballs.
-------------------------------------------------------------------
Fri Aug 29 15:52:15 CEST 2003 - pthomas@suse.de
- Change extfs commands to use posix conforming options
for head and sort. (#29657)
-------------------------------------------------------------------
Tue Jul 15 16:39:50 CEST 2003 - sbrabec@suse.cz
- Autoreconf with GNOME prefix.
-------------------------------------------------------------------
Fri Jun 13 08:31:45 CEST 2003 - kukuk@suse.de
- Fix filelist
-------------------------------------------------------------------
Fri Apr 4 11:56:21 CEST 2003 - pthomas@suse.de
- Enable character set conversion by compiling with
--enable-charset.
-------------------------------------------------------------------
Wed Feb 26 16:03:46 CET 2003 - pthomas@suse.de
- Fix the bug that leads to a segfault when viewing
files and simplify the range check.
- Get rid of the caddr_t anachronism.
- Use g_try_malloc when using glib2, as g_malloc terminates
the application when it fails .....
-------------------------------------------------------------------
Mon Feb 17 19:17:22 CET 2003 - pthomas@suse.de
- Update to 4.6.0 which officially removes gmc.
- Get rid of now obsolete patches and adapt those that
still apply.
-------------------------------------------------------------------
Tue Feb 4 11:12:45 CET 2003 - pthomas@suse.de
- Only include %{_libdir}/mc in files on biarch platforms.
-------------------------------------------------------------------
Mon Jan 27 15:27:51 CET 2003 - pthomas@suse.de
- Drop gmc sub package.
- Also check for ksh in mc.sh to decide whether or not to use
'export -f'
-------------------------------------------------------------------
Mon Nov 11 11:26:13 CET 2002 - ro@suse.de
- changed neededforbuild <jade_dsl> to <openjade>
- changed neededforbuild <sp> to <opensp>
- changed neededforbuild <sp-devel> to <>
-------------------------------------------------------------------
Wed Oct 23 19:04:57 CEST 2002 - sbrabec@suse.cz
- Fixed dangling symlink for mcview.
-------------------------------------------------------------------
Fri Sep 27 14:34:17 CEST 2002 - ro@suse.de
- Added alsa alsa-devel to neededforbuild (esound)
-------------------------------------------------------------------
Mon Sep 16 12:18:03 CEST 2002 - pthomas@suse.de
- Make mc use the system supplied slang library.
-------------------------------------------------------------------
Wed Sep 11 13:36:00 CEST 2002 - pthomas@suse.de
- Make full eight bits input the default (bug #15721).
- Use the gnome macros supplied with gnome-common.
- Use file type rather then regex to identify Word documents.
- Use wvText instead of word2x for displaying MS Word documents.
-------------------------------------------------------------------
Tue Aug 20 02:24:54 CEST 2002 - mmj@suse.de
- Correct PreReq
-------------------------------------------------------------------
Fri Aug 2 17:33:37 CEST 2002 - pthomas@suse.de
- Fix building with older versions of ext2fs lib
(AKA older distributions):
- Make configure check for presence of ext2_ino_t in ext2fs.h.
- Use test result in vfs/undelfs.c
-------------------------------------------------------------------
Sat Jul 27 15:43:47 CEST 2002 - adrian@suse.de
- fix %pre script and neededforbuild
-------------------------------------------------------------------
Fri May 31 15:57:21 CEST 2002 - ro@suse.de
- changed neededforbuild <slang> to <slang slang-devel>
-------------------------------------------------------------------
Mon Apr 8 15:26:06 CEST 2002 - ro@suse.de
- run gettextize
-------------------------------------------------------------------
Fri Mar 15 13:26:57 CET 2002 - pthomas@suse.de
- Use w3m instead of lynx for html. Fixes #15012
-------------------------------------------------------------------
Thu Feb 7 12:10:40 MET 2002 - mmj@suse.de
- ... and then fix a stupid typo in the below fix...
-------------------------------------------------------------------
Thu Feb 7 11:40:16 MET 2002 - mmj@suse.de
- Fixed the below thing in a more POSIX compliant way
-------------------------------------------------------------------
Tue Feb 5 17:20:14 CET 2002 - mmj@suse.de
- Added missing function to ms.sh
-------------------------------------------------------------------
Fri Feb 1 00:26:05 CET 2002 - ro@suse.de
- changed neededforbuild <libpng> to <libpng-devel-packages>
-------------------------------------------------------------------
Thu Jan 24 12:16:05 CET 2002 - okir@suse.de
- fixed various tempfile races (mostly with unpacking/packing
of compressed files for editing)
-------------------------------------------------------------------
Mon Jan 14 18:08:58 CET 2002 - egmont@suselinux.hu
- Removed rpmview patch, no longer needed since 4.5.55.
-------------------------------------------------------------------
Thu Dec 6 18:44:51 CET 2001 - pthomas@suse.de
- Include *all* gnome autoconf macros needed to
rebuild aclocal.m4.
-------------------------------------------------------------------
Fri Nov 30 15:08:32 CET 2001 - ro@suse.de
- changed neededforbuild <docbktls> to <docbook-toys>
-------------------------------------------------------------------
Mon Nov 26 15:54:59 CET 2001 - pthomas@suse.de
- Update to 4.5.55.
- Enable large file support.
- Gracefully handle the case when file size exceeds what
g_malloc can handle.
- Don't hard-code the GUI web browser but call a script that
uses whatever's installed.
- Use ext2_ino_t instead of ino_t.
- Add German hints.
-------------------------------------------------------------------
Thu Oct 18 15:52:35 CEST 2001 - egmont@suselinux.hu
- F3 on an RPM shows sane output (kind of rpm -qilp) instead of raw
binary.
-------------------------------------------------------------------
Thu Sep 20 20:57:05 CEST 2001 - pthomas@suse.de
- Fix handling of RPMs. This isn't a final fix, but at least
avoids the error.
-------------------------------------------------------------------
Tue Sep 4 11:10:21 CEST 2001 - kukuk@suse.de
- Removed smbclnt requires
-------------------------------------------------------------------
Mon Aug 27 10:52:21 CEST 2001 - kukuk@suse.de
- Removed samba-client, not need any longer
-------------------------------------------------------------------
Mon Aug 27 10:02:15 CEST 2001 - ro@suse.de
- replaced <smbclnt> by <samba-client> in neededforbuild
-------------------------------------------------------------------
Wed Aug 15 04:28:20 CEST 2001 - pthomas@suse.de
- Redo declaration fixes.
- Drop samba support, it's dependencies cause too much trouble.
- Reduce compiler warnings.
- Require autoconf 2.53 as this allows use of AC_CHECK_DECLS
- Use AC_CHECK_DECLS to properly control local prototypes.
-------------------------------------------------------------------
Mon Aug 13 15:51:56 CEST 2001 - ro@suse.de
- changed neededforbuild <sp_libs> to <sp-devel>
-------------------------------------------------------------------
Sat Aug 11 17:25:44 CEST 2001 - schwab@suse.de
- Fix missing declarations *again*.
-------------------------------------------------------------------
Tue Jul 31 17:40:25 CEST 2001 - cstein@suse.de
- wrote an assembly language syntax highlighting for mcedit
(Intel syntax)
-------------------------------------------------------------------
Sat Jul 7 16:50:21 MEST 2001 - egger@suse.de
- Updated to version 4.5.54.
- Had to remove a few patches to make it build.
- Buildproofed on all architectures.
-------------------------------------------------------------------
Wed Jun 27 11:10:39 CEST 2001 - cstein@suse.de
- Modified mc to include some helpful functions for palm pilot
users; modifications added as patch 30 (see spec file)
-------------------------------------------------------------------
Mon Jun 11 17:24:50 CEST 2001 - pthomas@suse.de
- Create missing stamp-h.in that prevented mc to build.
- Don't use --with-gpm-mouse on s390
-------------------------------------------------------------------
Sat May 12 17:54:24 CEST 2001 - schwab@suse.de
- Fix missing declarations.
-------------------------------------------------------------------
Wed May 9 16:58:37 CEST 2001 - pthomas@suse.de
- remove samba codepages and require smbclnt.
Fixes Bug #7924
- compress sources with bzip2
-------------------------------------------------------------------
Tue May 8 16:13:34 CEST 2001 - pthomas@suse.de
- Include codepages from samba package and modify source to
search them in /usr/lib/mc/codepages. Fixes bug #7647
-------------------------------------------------------------------
Fri Apr 20 15:17:26 CEST 2001 - pthomas@suse.de
- Fix call of suse_update_config macro.
- Remove offending multibyte sequence from Korean message
catalog and reenable building it.
-------------------------------------------------------------------
Wed Apr 18 10:49:41 CEST 2001 - pthomas@suse.de
- Disable building of the korean message catalog because
gettext 0.10.36 rejects it.
-------------------------------------------------------------------
Sat Apr 7 19:53:06 CEST 2001 - schwab@suse.de
- Correct handling of filenames in zoo and zip files.
Fixes Bug #6846.
- Add %suse_update_config.
- Fix configure check for off64_t and ino64_t.
-------------------------------------------------------------------
Sat Apr 7 06:38:35 CEST 2001 - pthomas@suse.de
- Remove regex match for *,[Dd]oc files and just rely on the
file type check. Add a second file type check as file(1) now
reports 'Microsoft office document'. Fixes Bug #6861
-------------------------------------------------------------------
Tue Mar 27 12:08:51 CEST 2001 - ro@suse.de
- changed neededforbuild <docbkdsl> to <docbook-dsssl-stylesheets>
-------------------------------------------------------------------
Tue Mar 20 04:09:56 CET 2001 - pthomas@suse.de
- Compile with samba and ext2 undelete support
- Add esound-devel and e2fsprogs-devel to neededforbuild
- Remove unnecessary checks from samba configure
- Add security fix for subshell
- Add security fix for cons.saver
-------------------------------------------------------------------
Tue Mar 13 12:58:39 CET 2001 - ro@suse.de
- added xf86 to neededforbuild
-------------------------------------------------------------------
Tue Mar 13 01:12:28 CET 2001 - ro@suse.de
- changed neededforbuild <docbk30> to <docbook_3>
-------------------------------------------------------------------
Sun Feb 25 18:28:47 MET 2001 - egger@suse.de
- Remove unnecessary dependencies from #neededforbuild,
especially imlib-config.
-------------------------------------------------------------------
Fri Feb 23 00:10:25 CET 2001 - ro@suse.de
- added readline/readline-devel to neededforbuild (split from bash)
-------------------------------------------------------------------
Tue Feb 20 15:11:12 CET 2001 - uli@suse.de
- fixed for new glibc
-------------------------------------------------------------------
Tue Jan 30 23:35:00 CET 2001 - ro@suse.de
- changed neededforbuild <imlibcfe> to <imlib-config>
-------------------------------------------------------------------
Sun Jan 21 11:04:06 CET 2001 - violiet@suse.de
- added eightbit-clean.patch to view/edit for Japanese and
Korean characters.
- added improvement Japanese latest .po from CVS.
- added improvement Korean .po and mc hint message file.
-------------------------------------------------------------------
Fri Dec 15 15:29:31 CET 2000 - hhetter@suse.de
- fix for dead link on startup-links, fixing bug id#4700
- changed startup-link URLs
-------------------------------------------------------------------
Tue Nov 21 17:46:13 CET 2000 - werner@suse.de
- Add kvt and gnome as valid TERMinals
- Add some newer xterm escape sequences (oldFunctionsKeys)
- console, linux xterm-color, kvt, and gnome are colored TERMinals
-------------------------------------------------------------------
Mon Nov 6 06:10:19 MET 2000 - pthomas@suse.de
- Remove version number from spec file name
- Add additional key definitions for mc.lib
- Clean up the spec file a bit.
-------------------------------------------------------------------
Sun Nov 5 15:20:14 CET 2000 - kukuk@suse.de
- adjust neededforbuild
-------------------------------------------------------------------
Wed Nov 1 01:21:05 MET 2000 - egger@suse.de
- Updated specfile to new long packagenames.
- Reworked specfile.
- Probably needs some more work; I'm taking care of that.
-------------------------------------------------------------------
Mon Sep 25 17:06:29 MEST 2000 - egger@suse.de
- Updated to 4.5.51.
- Buildproofed on i386.
-------------------------------------------------------------------
Wed May 31 01:06:40 CEST 2000 - baulig@suse.de
- update: 4.5.50.
-------------------------------------------------------------------
Sun May 28 03:18:02 CEST 2000 - baulig@suse.de
- update: 4.5.49.
- use %{ver} instead of the direct version number in tarball name.
-------------------------------------------------------------------
Mon Dec 13 16:07:55 MET 1999 - ke@suse.de
- update: 4.5.42.
-------------------------------------------------------------------
Thu Nov 18 13:51:38 CET 1999 - ke@suse.de
- update: 4.5.41.
- create HTML documentation (add SGML packages to neededfoarbuild...).
- add SuSE startup-link ;)
-------------------------------------------------------------------
Fri Oct 29 19:17:59 CEST 1999 - ke@suse.de
- fix /etc/opt/gnome vs. /opt/gnome/etc.
-------------------------------------------------------------------
Thu Oct 14 14:07:51 CEST 1999 - ke@suse.de
- update: 4.5.40.
- add some RH patches.
-------------------------------------------------------------------
Mon Sep 27 16:31:01 CEST 1999 - bs@suse.de
- fixed requirements for sub packages
-------------------------------------------------------------------
Fri Sep 24 17:56:53 MEST 1999 - ke@suse.de
- update: version 4.5.39.
-------------------------------------------------------------------
Fri Sep 17 13:56:05 MEST 1999 - ke@suse.de
- update: version 4.5.38.
-------------------------------------------------------------------
Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
-------------------------------------------------------------------
Thu Jul 15 19:26:11 MEST 1999 - ke@suse.de
- update: version 4.5.37.
-------------------------------------------------------------------
Tue Jul 13 12:42:22 MEST 1999 - bs@suse.de
- use gtk and glib instead of gtkn and glibn
-------------------------------------------------------------------
Mon Jul 12 10:02:58 MEST 1999 - ke@suse.de
- update: version 4.5.36.
-------------------------------------------------------------------
Tue Jun 8 18:20:36 MEST 1999 - kukuk@suse.de
- Add pam to needforbuild
-------------------------------------------------------------------
Sun May 30 15:55:33 MEST 1999 - ke@suse.de
- update: version 4.5.33.
-------------------------------------------------------------------
Tue Apr 13 14:01:38 MEST 1999 - ke@suse.de
- update: version 4.5.30 (security fixes - /tmp exploids...).
-------------------------------------------------------------------
Tue Apr 6 15:08:24 MEST 1999 - ro@suse.de
- only link gmc.gnorba for /etc/opt/gnome/CORBA/servers
-------------------------------------------------------------------
Mon Apr 5 14:26:29 MEST 1999 - bs@suse.de
- fixed date strings in .changes.
-------------------------------------------------------------------
Mon Apr 5 13:50:27 MEST 1999 - bs@suse.de
- use absolute links to prevent problems with a symlinked /opt.
-------------------------------------------------------------------
Sun Mar 14 13:29:52 MET 1999 - ke@suse.de
- update: version 4.5.25.
-------------------------------------------------------------------
Wed Mar 10 15:05:18 MET 1999 - ke@suse.de
- update: version 4.5.24.
-------------------------------------------------------------------
Thu Mar 4 09:36:07 MET 1999 - ke@suse.de
- update: version 4.5.23 (bugfix release).
- filelist.
-------------------------------------------------------------------
Sat Feb 27 15:57:05 MET 1999 - ke@suse.de
- update: version 4.5.22 (bugfix release).
-------------------------------------------------------------------
Fri Feb 26 15:51:18 MET 1999 - ke@suse.de
- update: version 4.5.21 (bugfix release).
- --disable-nls (it makes mc segfault).
- now, the text oriented part of the package (mc.rpm) lives under /usr
again.
-------------------------------------------------------------------
Wed Feb 17 09:05:02 MET 1999 - ke@suse.de
- update: version 4.5.17 (bugfix release).
- use sysconfdir=/etc/opt/gnome.
- #neededforbuild: add esound and audiofil.
-------------------------------------------------------------------
Sun Feb 14 10:39:24 MET 1999 - ke@suse.de
- update: version 4.5.14 (bugfix release).
-------------------------------------------------------------------
Thu Feb 11 10:53:07 MET 1999 - ke@suse.de
- update: version 4.5.13.
-------------------------------------------------------------------
Sat Feb 6 01:23:59 MET 1999 - ro@suse.de
- fixed neededforbuild
-------------------------------------------------------------------
Thu Feb 4 10:40:51 MET 1999 - ke@suse.de
- update: version 4.5.10.
- now, there's the subpackage `gmc' containing the GNOME compliant version
of mc.
- make the package BuildRoot capable.
-------------------------------------------------------------------
Wed Dec 9 12:47:08 MET 1998 - ke@suse.de
- update to mc 4.1.36 (bugfix release).
-------------------------------------------------------------------
Thu Sep 24 21:18:27 MEST 1998 - ke@suse.de
- enable NLS.
- install documentation and COPYING via the %doc macro.
-------------------------------------------------------------------
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
- for screen output, mc now uses the slang library and not the ncurses functions
directly

View File

@ -1,7 +0,0 @@
[Desktop Entry]
Type=Application
Name=Midnight Commander
Exec=mc
Terminal=true
Icon=mc

3
mc.png
View File

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

1
mc.rpmlintrc Normal file
View File

@ -0,0 +1 @@
addFilter("permissions-file-setuid-bit.*.*")

614
mc.spec
View File

@ -1,258 +1,408 @@
# # Note that this is NOT a relocatable package
# spec file for package mc (Version 4.6.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ %define legacy_rhel 0%{?el4}%{?el3}
#
# norootforbuild %if %{legacy_rhel}
%define _with_screen --with-screen=ncurses
%define _with_glib_static --with-glib-static
%define glib_version 2.12
%define glib_stepping .3
%else
%define _with_screen --with-screen=slang
%endif
%define mc_version 4.7.3
%define mc_release 1%{?dist}
#%define _localedir %{_prefix}/share/locale
Summary: User-friendly text console file manager and visual shell
Name: mc Name: mc
Summary: Midnight Commander Version: %{mc_version}
Release: %{mc_release}%{?dist}
Epoch: 3
License: GPLv2
%if %{legacy_rhel}
Group: System Environment/Shells
%else
Group: Productivity/File utilities Group: Productivity/File utilities
License: GPLv2+ %endif
Url: http://www.ibiblio.org/mc/ Source0: %{name}-%{mc_version}.tar.bz2
Version: 4.7.0.7
Release: 7
Source: mc-%{version}.tar.lzma
Source1: x11_browser
Source2: %{name}.desktop
Source3: %{name}.png
Patch0: mc-fix_lib_search_path.patch
Patch6: mc-apps.patch
Patch7: mc-palmsupport.patch
Patch8: mc-word_docs.patch
Patch9: mc-x11browser.diff
Patch12: mc-wrapper.patch
Patch14: mc-syntax-hpp.patch
Patch16: mc-esc-seq.patch
Patch17: mc-rpm.patch
Patch20: mc-f-keys.patch
#debian fixes for vfs
Patch24: 02_ignore_ftp_chmod_error.patch
#Debian fixes
Patch30: 04_add_gem_extension.patch
Patch31: 09_uzip_broken_528239.patch
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.
Patch41: mc-multi-press-f-keys.patch
# Patches from Fedora
Patch50: mc-extensions.patch
Patch51: mc-mcviewsegfault.patch
Patch52: mc-int_ptr_casts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{legacy_rhel}
BuildRequires: audiofile-devel Source1: http://ftp.gnome.org/pub/gnome/sources/glib/%{glib_version}/glib-%{glib_version}%{?glib_stepping}.tar.bz2
BuildRequires: docbook-toys Patch0: glib2-CVE-2008-4316.patch
BuildRequires: e2fsprogs-devel %endif
BuildRequires: fdupes
BuildRequires: glib2-devel URL: http://www.midnight-commander.org/
BuildRequires: gpm BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: indent BuildRequires: e2fsprogs-devel gpm perl
BuildRequires: jpeg
BuildRequires: libjpeg-devel %if 0%{?fedora_version}
BuildRequires: libpng-devel BuildRequires: gpm-devel
BuildRequires: readline-devel %endif
BuildRequires: recode
BuildRequires: slang-devel %if %{legacy_rhel}%{?el5} || 0%{?sles_version} <= 10
BuildRequires: update-desktop-files BuildRequires: pcre-devel
BuildRequires: xorg-x11-devel %endif
BuildRequires: xdg-utils
BuildRequires: xz %if %{legacy_rhel}
Requires(pre): permissions
Recommends: %{name}-lang = %{version} BuildRequires: ncurses-devel
# From Glib
BuildRequires: pkgconfig gettext
%else
BuildRequires: glib2-devel slang-devel
%endif
%description %description
Midnight Commander is a Norton Commander clone, a program that GNU Midnight Commander is a visual file manager. It's a feature rich
manipulates and manages files and directories. It is useful, fast, and full-screen text mode application that allows you to copy, move and
has color display on the Linux console. It also has mouse support if delete files and whole directory trees, search for files and run
you run the gpm mouse server. This program requires the terminal commands in the subshell. Internal viewer and editor are included. Mouse
description files in /usr/lib/terminfo, which are found in ncurses.rpm is supported on Linux console. VFS (Virtual Filesystem) allows you to
(the essential ones) or terminfo.rpm (the rest). view archives and files on remote servers (via SAMBA, FTP or SSH).
You can also use Midnight Commander under the X Window System with your #%package lang
mouse. If you enter 'mc -c', colors are used. #Summary: The language files for mc
#Group: System/Localization
In Midnight Commander, the screen is divided into four sections: The #%description lang
majority of the screen is covered by two directory panels. The second #Provides translations to the package mc
to last line on the screen is the shell command line. The last line
displays the function key assignments. At the very top, the menu list
is shown. One of the directories displayed is the current working %if 0%{?suse_version} >= 1110
directory. This is where most of the commands are found. For certain mkdir %buildroot
commands, like copy and move, the second directory is used as the %endif
target directory.
%lang_package
%prep %prep
%setup -q
%patch0 %setup -q -n %{name}-%{mc_version}
%patch6
%patch7 %if %{legacy_rhel}
%patch8
%patch9 %setup -q -T -D -a 1 -n %{name}-%{mc_version}
%patch12
%patch14 cd glib-%{glib_version}%{?glib_stepping}
%patch16 %patch0 -p1 -b .CVE-2008-4316
%patch17
%patch20 %endif
%patch24
%patch30
%patch31
%patch32
%patch41
%patch50
%patch51
pushd doc/hints
iconv -f iso8859-1 -t utf-8 -o mc.hint.tmp mc.hint && mv mc.hint.tmp mc.hint
iconv -f iso8859-1 -t utf-8 -o mc.hint.es.tmp mc.hint.es && mv mc.hint.es.tmp mc.hint.es
iconv -f iso8859-1 -t utf-8 -o mc.hint.it.tmp mc.hint.it && mv mc.hint.it.tmp mc.hint.it
iconv -f iso8859-1 -t utf-8 -o mc.hint.nl.tmp mc.hint.nl && mv mc.hint.nl.tmp mc.hint.nl
iconv -f iso8859-2 -t utf-8 -o mc.hint.cs.tmp mc.hint.cs && mv mc.hint.cs.tmp mc.hint.cs
iconv -f iso8859-2 -t utf-8 -o mc.hint.hu.tmp mc.hint.hu && mv mc.hint.hu.tmp mc.hint.hu
iconv -f iso8859-2 -t utf-8 -o mc.hint.pl.tmp mc.hint.pl && mv mc.hint.pl.tmp mc.hint.pl
iconv -f iso8859-5 -t utf-8 -o mc.hint.sr.tmp mc.hint.sr && mv mc.hint.sr.tmp mc.hint.sr
iconv -f koi8-r -t utf8 -o mc.hint.ru.tmp mc.hint.ru && mv mc.hint.ru.tmp mc.hint.ru
iconv -f koi8-u -t utf8 -o mc.hint.uk.tmp mc.hint.uk && mv mc.hint.uk.tmp mc.hint.uk
iconv -f big5 -t utf8 -o mc.hint.zh.tmp mc.hint.zh && mv mc.hint.zh.tmp mc.hint.zh
popd
pushd misc
iconv -f iso8859-5 -t utf-8 -o mc.menu.sr.tmp mc.menu.sr && mv mc.menu.sr.tmp mc.menu.sr
popd
# convert docs to utf-8
pushd doc
pushd man
pushd es
iconv -f iso8859-1 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
popd
pushd hu
iconv -f iso8859-2 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
popd
pushd it
iconv -f iso8859-1 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
popd
pushd pl
iconv -f iso8859-2 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
popd
pushd ru
iconv -f koi8-r -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
popd
pushd sr
iconv -f iso8859-5 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
iconv -f iso8859-5 -t utf-8 -o mcserv.8.in.tmp mcserv.8.in && mv mcserv.8.in.tmp mcserv.8.in
popd # doc/man
popd # doc/
pushd hlp
pushd es
iconv -f iso8859-1 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
popd
pushd hu
iconv -f iso8859-2 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
popd
pushd it
iconv -f iso8859-1 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
popd
pushd pl
iconv -f iso8859-2 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
popd
pushd ru
iconv -f koi8-r -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
popd
pushd sr
iconv -f iso8859-5 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
popd # doc/hlp
popd # doc/
popd
%build %build
autoreconf --force --install
%define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security -Wno-unused-parameter %if %{legacy_rhel}
export CFLAGS="$RPM_OPT_FLAGS %{warn_flags}"
pushd glib-%{glib_version}%{?glib_stepping}
RESULT_DIR=`pwd`/result
./configure \
--disable-gtk-doc \
--disable-shared \
--enable-static \
--prefix="$RESULT_DIR" \
--exec-prefix="$RESULT_DIR" \
--libdir="$RESULT_DIR/usr/%{_lib}"
%{__make} %{?_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" install
popd
PKG_CONFIG_PATH="$RESULT_DIR/usr/%{_lib}/pkgconfig:$PKG_CONFIG_PATH" ; export PKG_CONFIG_PATH ;
%endif
%configure \ %configure \
--localstatedir=/var/lib \ %{_with_screen} \
%{?_with_glib_static} \
--enable-charset \ --enable-charset \
--with-samba --with-samba \
make %{?jobs:-j%{jobs}} --without-x \
--with-gpm-mouse \
%if 0%{?sles_version} < 11
--disable-vfs-fish \
%endif
--disable-doxygen-doc
%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
%install %install
make DESTDIR=%{buildroot} install rm -rf $RPM_BUILD_ROOT
# clean up this setuid problem for now mkdir $RPM_BUILD_ROOT
chmod 755 %{buildroot}/%{_libexecdir}/mc/cons.saver
# copy Korean mc hint message,
# install -m 0644 %{SOURCE3} %{datadir}/mc/ make install DESTDIR="$RPM_BUILD_ROOT"
#install the shell functions for bourne shell and csh
mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
ln -fs -t %{buildroot}%{_sysconfdir}/profile.d %{_datadir}/mc/mc.{,c}sh install contrib/{mc.sh,mc.csh} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
#support script for calling available GUI webbrosers
install -m 755 %{SOURCE1} %{buildroot}%{_datadir}/mc/ %find_lang %{name}
install -D -m 644 %{S:3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
%suse_update_desktop_file -i %name System FileManager
%{find_lang} %{name}
%fdupes -s %{buildroot}%{_prefix}
%clean %clean
rm -rf %{buildroot} rm -rf $RPM_BUILD_ROOT
%post %files -f %{name}.lang
%run_permissions
%verifyscript
%verify_permissions -e %{_libexecdir}/mc/cons.saver
%files
%defattr(-, root, root) %defattr(-, root, root)
%doc ABOUT-NLS COPYING NEWS README
%config %{_sysconfdir}/profile.d/*
%{_bindir}/mc*
%dir %{_sysconfdir}/mc
%config %{_sysconfdir}/mc/filehighlight.ini
%config %{_sysconfdir}/mc/sfs.ini
%config %{_sysconfdir}/mc/mc.menu
%config %{_sysconfdir}/mc/Syntax
%config %{_sysconfdir}/mc/mc.ext
%config %{_sysconfdir}/mc/mc.keymap.emacs
%config %{_sysconfdir}/mc/edit.spell.rc
%config %{_sysconfdir}/mc/mc.lib
%config %{_sysconfdir}/mc/cedit.menu
%config %{_sysconfdir}/mc/mc.keymap.default
%config %{_sysconfdir}/mc/mc.charsets
%config %{_sysconfdir}/mc/mc.keymap
%config %{_sysconfdir}/mc/edit.indent.rc
%dir %{_libexecdir}/mc
%verify(not mode) %{_libexecdir}/mc/cons.saver
%{_mandir}/man1/*
%{_datadir}/mc
%{_libexecdir}/mc
%exclude %{_datadir}/mc/mc.hint.*
%exclude %{_datadir}/mc/mc.hlp.*
%exclude %{_sysconfdir}/mc/mc.menu.*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%lang(es) %doc %{_mandir}/es
%lang(hu) %doc %{_mandir}/hu
%lang(it) %doc %{_mandir}/it
%lang(pl) %doc %{_mandir}/pl
%lang(ru) %doc %{_mandir}/ru
%lang(sr) %doc %{_mandir}/sr
%lang(cs) %doc %{_datadir}/mc/mc.*.cs
%lang(es) %doc %{_datadir}/mc/mc.*.es
%lang(hu) %doc %{_datadir}/mc/mc.*.hu
%lang(it) %doc %{_datadir}/mc/mc.*.it
%lang(nl) %doc %{_datadir}/mc/mc.*.nl
%lang(pl) %doc %{_datadir}/mc/mc.*.pl
%lang(sr) %doc %{_datadir}/mc/mc.*.sr
%files lang -f %{name}.lang %doc doc/FAQ doc/COPYING doc/NEWS doc/README
%{_bindir}/mc
%{_bindir}/mcedit
%{_bindir}/mcview
%{_bindir}/mcmfmt
%{_bindir}/mcdiff
%dir %{_libexecdir}/mc
%dir %{_libexecdir}/mc/extfs.d
%dir %{_libexecdir}/mc/fish
%if 0%{?fedora_version}
%attr(4511, vcsa, tty) %{_libexecdir}/mc/cons.saver
%endif
%if 0%{?suse_version} >= 1110
%attr(4511, root, tty) %verify(not mode group) %{_libexecdir}/mc/cons.saver
%else
%attr(4511, root, tty) %{_libexecdir}/mc/cons.saver
%endif
%{_libexecdir}/mc/mc*sh
%{_libexecdir}/mc/extfs.d/*
%{_libexecdir}/mc/fish/*
%{_sysconfdir}/profile.d/*
%dir %{_sysconfdir}/mc
%config %{_sysconfdir}/mc/Syntax
%config %{_sysconfdir}/mc/mc.charsets
%config %{_sysconfdir}/mc/mc.lib
%config(noreplace) %{_sysconfdir}/mc/filehighlight.ini
%config(noreplace) %{_sysconfdir}/mc/*edit*
%config(noreplace) %{_sysconfdir}/mc/mc.ext
%config(noreplace) %{_sysconfdir}/mc/mc.menu
%config(noreplace) %{_sysconfdir}/mc/mc.menu.*
%config(noreplace) %{_sysconfdir}/mc/sfs.ini
%config(noreplace) %{_sysconfdir}/mc/mc.keymap
%config(noreplace) %{_sysconfdir}/mc/mc.keymap.*
%dir %{_datadir}/mc
%{_datadir}/mc/*
%dir %{_datadir}/locale/be-tarask
%dir %{_datadir}/locale/be-tarask/LC_MESSAGES
%{_mandir}/man1/*
%dir %{_mandir}/hu
%dir %{_mandir}/hu/man1
%dir %{_mandir}/pl
%dir %{_mandir}/pl/man1
%dir %{_mandir}/ru
%dir %{_mandir}/ru/man1
%dir %{_mandir}/sr
%dir %{_mandir}/sr/man1
%lang(es) %{_mandir}/es/man1/mc.1*
%lang(hu) %{_mandir}/hu/man1/mc.1*
%lang(it) %{_mandir}/it/man1/mc.1*
%lang(pl) %{_mandir}/pl/man1/mc.1*
%lang(ru) %{_mandir}/ru/man1/mc.1*
%lang(sr) %{_mandir}/sr/man1/mc.1*
#%files lang
#%defattr(-, root, root)
#%_localedir/*/*/*.mo
%changelog %changelog
* Fri Jul 16 2010 Walery Wysotsky <wwalery@gmail.com>
- update spec for 4.7.3 to openSUSE 11.3
* Tue Jul 06 2010 Walery Wysotsky <wwalery@gmail.com>
- update spec to 4.7.3
* Wed Apr 28 2010 Yury V. Zaytsev <yury@shurup.com>
- Added mcdiff to the list of packaged files.
* Tue Feb 09 2010 Andrew Borodin <aborodin@vmail.ru>
- Fixed file list because of EXTFS VFS reorganizing.
* Wed Dec 30 2009 Yury V. Zaytsev <yury@shurup.com>
- Bumped the epoch again and changed the versioning scheme.
- Thanks to Slava Zanko for all his hard work on m4 vodoo!
* Fri Dec 25 2009 Yury V. Zaytsev <yury@shurup.com>
- Had to bump the epoch because of the braindead versioning scheme used.
* Fri Nov 27 2009 Yury V. Zaytsev <yury@shurup.com>
- Fixed debug info generation for legacy distros.
- Rewritten and simplified static build procedure.
* Mon Oct 26 2009 Andrew Borodin <aborodin@vmail.ru>
- Added new %%{_sysconfdir}/mc/mc.keymap.* files.
* Fri Sep 04 2009 Slava Zanko <slavazanko@gmail.com>
- Add new file %%{_sysconfdir}/mc/filehighlight.ini.
* Sat Aug 01 2009 Yury V. Zaytsev <yury@shurup.com>
- Fixed EL4 (and supposedly EL3) builds.
- Fixed some of the rpmlint warnings.
* Sat Jul 04 2009 Yury V. Zaytsev <yury@shurup.com>
- Fix the issue when wrappers were left unpackaged.
* Thu May 21 2009 Slava Zanko <slavazanko@gmail.com>
- Fix install patches: use %%{_sysconfdir}/mc directory.
* Fri May 8 2009 Slava Zanko <slavazanko@gmail.com>
- Reviewed spec-file to build on the current distributions.
- Changed build rules.
- Fixed install paths.
* Fri Jun 22 2007 Pavel Roskin <proski@gnu.org>
- Made cons.saver suid vcsa, it's needed for Fedora 7.
* Thu Dec 21 2006 Pavel Roskin <proski@gnu.org>
- Don't rely on brace expansion, it may be disabled.
* Mon Jan 30 2006 Pavel Roskin <proski@gnu.org>
- Avoid using %%{_prefix} where more specialized macros are available.
* Tue Aug 02 2005 Pavel Roskin <proski@gnu.org>
- Replace obsolete "Copyright" with "License".
* Thu Mar 31 2005 Pavel Roskin <proski@gnu.org>
- Comment out build dependencies - they are too distribution specific.
* Tue Sep 23 2003 Pavel Roskin <proski@gnu.org>
- Remove term directory, it's obsolete and irrelevant on modern systems.
- Include translated menu files.
* Sun Feb 16 2003 Pavel Roskin <proski@gnu.org>
- Remove obsolete dependency on /sbin/chkconfig.
* Tue Dec 24 2002 Pavel Roskin <proski@gnu.org>
- Work around bug in rpm 4.1 that expands defines in comments.
- Handle --without-x.
* Mon Nov 04 2002 Andrew V. Samoilov <sav@bcs.zp.ua>
- Handle --with ext2undel.
* Fri Nov 01 2002 Pavel Roskin <proski@gnu.org>
- Add wrappers to support setting last directory on exit. Keep all
scripts in their original directory, just copy them.
* Tue Oct 22 2002 Pavel Roskin <proski@gnu.org>
- Don't use the included S-Lang, there is a workaround for Red Hat 8.0
S-Lang, and binary compatibility with Red Hat 7.x doesn't work anyway.
* Tue Oct 08 2002 Pavel Roskin <proski@gnu.org>
- Use the included S-Lang again, since we include a better version now.
This should avoid incompatibility with Red Hat 7.x.
- Add _with_glib2 option.
* Mon Oct 07 2002 Pavel Roskin <proski@gnu.org>
- Remove installed mc.sh and mc.csh from %%{_prefix}/share/mc/bin to
suppress a warning about installed but unpackaged files.
* Mon Sep 30 2002 Andrew V. Samoilov <sav@bcs.zp.ua>
- Don't require slang-devel if _with_ncurses.
- Handle --with samba.
* Sun Sep 29 2002 Pavel Roskin <proski@gnu.org>
- Use --with-screen instead of --with-ncurses and --with-included-slang.
* Mon Sep 23 2002 Andrew V. Samoilov <sav@bcs.zp.ua>
- Restore %%config for %%{_prefix}/share/mc/mc.charsets.
- Restore %%{_prefix}/share/mc/edit.spell.rc.
* Sat Sep 21 2002 Pavel Roskin <proski@gnu.org>
- Use FHS-compliant paths.
- Drop %%config from files under /usr/share - users are not supposed to
edit them. Local copies under ~/.mc should be used for that.
* Wed Aug 21 2002 Pavel Roskin <proski@gnu.org>
- Change description, update URLs, allow dash in the version.
* Tue Aug 20 2002 Pavel Roskin <proski@gnu.org>
- Support conditional builds.
* Tue Aug 20 2002 Andrew V. Samoilov <sav@bcs.zp.ua>
- Add /usr/lib/mc/mc.charsets.
- Add %%{_mandir}/*/man1/*.
* Fri Aug 16 2002 Pavel Roskin <proski@gnu.org>
- Remove mc.global.
* Mon Jan 21 2002 Pavel Roskin <proski@gnu.org>
- Remove --with-gnome and --with-included-slang from configure options.
- Add BuildPrereq.
* Fri Aug 24 2001 Pavel Roskin <proski@gnu.org>
- Remove gmc. Reunite mc and mc-common.
* Sun Aug 05 2001 Pavel Roskin <proski@gnu.org>
- Set epoch.
* Sun Jul 15 2001 Pavel Roskin <proski@gnu.org>
- Remove /usr/lib/mc/layout.
* Sat Jun 09 2001 Pavel Roskin <proski@gnu.org>
- Use %%{_prefix} and %%{_mandir}. Specify --mandir to configure.
* Fri May 25 2001 Pavel Roskin <proski@gnu.org>
- Change groups. Don't include locale directories. More config files.
* Sun May 20 2001 Pavel Roskin <proski@gnu.org>
- Don't require stylesheets, since HTML files are now in the tarball.
* Thu Apr 19 2001 Pavel Roskin <proski@gnu.org>
- Remove package mcserv. Drop dependency on PAM.
* Mon Feb 26 2001 Pavel Roskin <proski@gnu.org>
- Remove mc-gnome.ext.
* Thu Jan 11 2001 Pavel Roskin <proski@gnu.org>
- Include mcview.
* Mon Oct 23 2000 Pavel Roskin <proski@gnu.org>
- Allow mcserv.8 to be gzipped.
* Sat Sep 30 2000 Pavel Roskin <proski@gnu.org>
- New package mc-common.
- Use DESTDIR instead of misusing prefix.
- Don't install old icons - they don't exist
* Sat Sep 23 2000 Pavel Roskin <proski@gnu.org>
- Include translations with mc, not gmc.
- chkconfig --del in %%preun, not %%postun.
- --without-debug not needed.
- /etc/X11/wmconfig not needed.
- /etc/pam.d/mcserv shouldn't be executable.
- New files in %%{prefix}/lib/mc/ - translated hints, editor files.
* Thu Sep 09 1999 Elliot Lee <sopwith@redhat.com>
- Include .idl files in the package.
* Sat Sep 04 1999 Gregory McLean <gregm@comstar.net>
- Added a build prereq so that rpms get built with documentation ;)
* Mon Jul 12 1999 Kjartan Maraas <kmaraas@online.no>
- Added help and locale files to %%files.
* Tue Jun 22 1999 Vladimir Kondratiev <vkondra@iil.intel.com>
- Added syntax files to %%files.
* Wed May 26 1999 Cody Russell <bratsche@dfw.net>
- Chmod cons.saver at $RPM_BUILD_ROOT%%{prefix}/lib rather than at
$RPM_BUILD_ROOT/usr/lib. We can now install to somewhere other than /usr.
* Sun Apr 18 1999 Gregory McLean <gregm@comstar.net>
- Updated the specfile, removed some kludges.
* Thu Aug 20 1998 Michael Fulbright <msf@redhat.com>
- Rebuilt against gnome-libs 0.27 and gtk+-1.1.
* Thu Jul 09 1998 Michael Fulbright <msf@redhat.com>
- Made cons.saver not setuid.
* Sun Apr 19 1998 Marc Ewing <marc@redhat.com>
- Removed tkmc.
* Wed Apr 8 1998 Marc Ewing <marc@redhat.com>
- Add /usr/lib/mc/layout to gmc.

View File

@ -1,59 +0,0 @@
#!/bin/bash
#
# Call appropriate brower
#
# Copyright (c) 2001 Philipp Thomas <pth@suse.de>
#
# Borrowed heavily from url_handler.sh by Werner Fink <werner@suse.de>
#
url="$1"
method="${1%%:*}"
if test "$url" = "$method" ; then
case "${url}" in
*/*.htm|*/*.html) method=http ;;
*/*.htmls) method=https ;;
/*) if test -r "${url}" ; then
method=file
fi ;;
*) if test -r "$PWD/${url}" ; then
method=file
url="$PWD/${url}"
fi ;;
esac
case "$method" in
file) url="${method}:$url" ;;
*) url="${method}://$url" ;;
esac
fi
shift
case "$method" in
file|http|https)
http=
type -p lynx >& /dev/null && http=lynx
type -p links >& /dev/null && http=links
type -p w3m >& /dev/null && http=w3m
test -n "$DISPLAY" && type -p netscape >& /dev/null && http=netscape
test -n "$DISPLAY" && type -p Netscape >& /dev/null && http=Netscape
test -n "$DISPLAY" && type -p opera >& /dev/null && http=opera
test -n "$DISPLAY" && type -p mozilla >& /dev/null && http=mozilla
case "$http" in
[nN]etscape|opera|mozilla) ($http -remote "openURL($url)" || $http "$url") >/dev/null 2>&1 & ;;
lynx|w3m|links) exec $http "$url" ;;
*)
echo "No HTTP browser found."
read -p "Press return to continue: "
exit 0 # No error return
;;
esac
;;
*)
echo "URL type \"$method\" not known"
read -p "Press return to continue: "
exit 0 # No error return
;;
esac