Accepting request 110840 from Base:System
updated for 4.8.1.1 (forwarded request 110296 from subchaser) OBS-URL: https://build.opensuse.org/request/show/110840 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=38
This commit is contained in:
commit
2f800bfa24
@ -1,13 +1,13 @@
|
|||||||
Index: lib/vfs/mc-vfs/ftpfs.c
|
Index: src/vfs/ftpfs/ftpfs.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- lib/vfs/mc-vfs/ftpfs.c.orig
|
--- src/vfs/ftpfs/ftpfs.c.orig
|
||||||
+++ lib/vfs/mc-vfs/ftpfs.c
|
+++ src/vfs/ftpfs/ftpfs.c
|
||||||
@@ -1987,7 +1987,7 @@ ftpfs_chmod (struct vfs_class *me, const
|
@@ -1987,7 +1987,7 @@ ftpfs_chmod (struct vfs_class *me, const
|
||||||
|
|
||||||
g_snprintf (buf, sizeof (buf), "SITE CHMOD %4.4o /%%s", mode & 07777);
|
g_snprintf (buf, sizeof (buf), "SITE CHMOD %4.4o /%%s", (int) (mode & 07777));
|
||||||
|
|
||||||
- ret = ftpfs_send_command (me, path, buf, OPT_FLUSH);
|
- ret = ftpfs_send_command (vpath, buf, OPT_FLUSH);
|
||||||
+ ret = ftpfs_send_command (me, path, buf, OPT_FLUSH | OPT_IGNORE_ERROR);
|
+ ret = ftpfs_send_command (vpath, buf, OPT_FLUSH | OPT_IGNORE_ERROR);
|
||||||
|
|
||||||
return ftpfs_ignore_chattr_errors ? 0 : ret;
|
return ftpfs_ignore_chattr_errors ? 0 : ret;
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,6 @@ Description: Add gem extension
|
|||||||
# .tgz, .tpz, .tar.gz, .tar.z, .tar.Z, .ipk
|
# .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$
|
||||||
+regex/\.t([gp]?z|ar\.g?[zZ])$|\.ipk|\.gem$
|
+regex/\.t([gp]?z|ar\.g?[zZ])$|\.ipk|\.gem$
|
||||||
Open=%cd %p#utar
|
Open=%cd %p/utar://
|
||||||
View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
|
View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
|
||||||
|
|
||||||
|
@ -3,8 +3,8 @@ Bug-Debian: http://bugs.debian.org/528239
|
|||||||
Author: Johannes Stezenbach <js@sig21.net>
|
Author: Johannes Stezenbach <js@sig21.net>
|
||||||
Author: Yury V. Zaytsev <yury@shurup.com>
|
Author: Yury V. Zaytsev <yury@shurup.com>
|
||||||
|
|
||||||
--- lib/vfs/mc-vfs/extfs/uzip.in 2010-02-25 11:51:39.000000000 +0100
|
--- src/vfs/extfs/helpers/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
|
+++ src/vfs/extfs/helpers/uzip.in 2010-03-17 10:43:37.000000000 +0100
|
||||||
@@ -19,7 +19,7 @@
|
@@ -19,7 +19,7 @@
|
||||||
# Location of the unzip program
|
# Location of the unzip program
|
||||||
my $app_unzip = "@UNZIP@";
|
my $app_unzip = "@UNZIP@";
|
||||||
|
128
cmake.syntax
Normal file
128
cmake.syntax
Normal file
@ -0,0 +1,128 @@
|
|||||||
|
# CMake syntax highlighting
|
||||||
|
#
|
||||||
|
# Author: Henrik Pauli <henrik.pauli@uhusystems.com>
|
||||||
|
# Author: Emil Biserov <biserov@gmail.com>
|
||||||
|
|
||||||
|
wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_
|
||||||
|
|
||||||
|
caseinsensitive
|
||||||
|
|
||||||
|
context default
|
||||||
|
keyword ( brightcyan
|
||||||
|
keyword ) brightcyan
|
||||||
|
|
||||||
|
keyword ${\[^}\]+} brightgreen
|
||||||
|
|
||||||
|
keyword whole macro magenta
|
||||||
|
keyword whole endmacro magenta
|
||||||
|
keyword whole function magenta
|
||||||
|
keyword whole endfunction magenta
|
||||||
|
keyword whole if magenta
|
||||||
|
keyword whole else magenta
|
||||||
|
keyword whole elseif magenta
|
||||||
|
keyword whole endif magenta
|
||||||
|
keyword whole foreach magenta
|
||||||
|
keyword whole endforeach magenta
|
||||||
|
keyword whole while magenta
|
||||||
|
keyword whole endwhile magenta
|
||||||
|
keyword whole break magenta
|
||||||
|
|
||||||
|
keyword whole cmake_minimum_required yellow
|
||||||
|
keyword whole project yellow
|
||||||
|
keyword whole set yellow
|
||||||
|
keyword whole unset yellow
|
||||||
|
keyword whole include yellow
|
||||||
|
keyword whole include_directories yellow
|
||||||
|
keyword whole link_directories yellow
|
||||||
|
keyword whole cpack_+ yellow
|
||||||
|
keyword whole add_+ yellow
|
||||||
|
keyword whole get_+ yellow
|
||||||
|
keyword whole set_+ yellow
|
||||||
|
keyword whole target_+ yellow
|
||||||
|
keyword whole find_+ yellow
|
||||||
|
keyword whole file yellow
|
||||||
|
keyword whole file_+ yellow
|
||||||
|
keyword whole configure_+ yellow
|
||||||
|
keyword whole install yellow
|
||||||
|
keyword whole qt4_+ yellow
|
||||||
|
keyword whole mark_as_advanced yellow
|
||||||
|
|
||||||
|
keyword whole list yellow
|
||||||
|
keyword whole string yellow
|
||||||
|
|
||||||
|
keyword whole message brightmagenta
|
||||||
|
keyword whole STATUS brightmagenta
|
||||||
|
keyword whole WARNING brightmagenta
|
||||||
|
keyword whole AUTHOR_WARNING brightmagenta
|
||||||
|
keyword whole FATAL_ERROR brightmagenta
|
||||||
|
keyword whole SEND_ERROR brightmagenta
|
||||||
|
|
||||||
|
keyword whole ON brightcyan
|
||||||
|
keyword whole OFF brightcyan
|
||||||
|
keyword whole TRUE brightcyan
|
||||||
|
keyword whole FALSE brightcyan
|
||||||
|
keyword whole OR brightcyan
|
||||||
|
keyword whole AND brightcyan
|
||||||
|
keyword whole NOT brightcyan
|
||||||
|
keyword whole DEFINED brightcyan
|
||||||
|
keyword whole COMMAND brightcyan
|
||||||
|
keyword whole POLICY brightcyan
|
||||||
|
keyword whole TARGET brightcyan
|
||||||
|
keyword whole EXISTS brightcyan
|
||||||
|
keyword whole IS_NEWER_THAN brightcyan
|
||||||
|
keyword whole IS_DIRECTORY brightcyan
|
||||||
|
keyword whole IS_SYMLINK brightcyan
|
||||||
|
keyword whole IS_ABSOLUTE brightcyan
|
||||||
|
keyword whole MATCHES brightcyan
|
||||||
|
keyword whole LESS brightcyan
|
||||||
|
keyword whole GREATER brightcyan
|
||||||
|
keyword whole EQUAL brightcyan
|
||||||
|
keyword whole STRLESS brightcyan
|
||||||
|
keyword whole STRGREATER brightcyan
|
||||||
|
keyword whole STREQUAL brightcyan
|
||||||
|
keyword whole VERSION_LESS brightcyan
|
||||||
|
keyword whole VERSION_EQUAL brightcyan
|
||||||
|
keyword whole VERSION_GREATER brightcyan
|
||||||
|
|
||||||
|
keyword whole STATIC white
|
||||||
|
keyword whole SHARED white
|
||||||
|
|
||||||
|
keyword whole NAMES white
|
||||||
|
keyword whole FILES white
|
||||||
|
keyword whole PATHS white
|
||||||
|
|
||||||
|
keyword whole NO_DEFAULT_PATH white
|
||||||
|
keyword whole NO_CMAKE_FIND_ROOT_PATH white
|
||||||
|
keyword whole NO_CMAKE_ENVIRONMENT_PATH white
|
||||||
|
keyword whole NO_CMAKE_PATH white
|
||||||
|
keyword whole NO_SYSTEM_ENVIRONMENT_PATH white
|
||||||
|
keyword whole NO_CMAKE_SYSTEM_PATH white
|
||||||
|
keyword whole ONLY_CMAKE_FIND_ROOT_PATH white
|
||||||
|
keyword whole NO_CMAKE_FIND_ROOT_PATH white
|
||||||
|
|
||||||
|
keyword whole DIRECTORY white
|
||||||
|
keyword whole RUNTIME white
|
||||||
|
keyword whole COMPONENT white
|
||||||
|
keyword whole DISPLAY_NAME white
|
||||||
|
keyword whole DESCRIPTION white
|
||||||
|
keyword whole GROUP white
|
||||||
|
keyword whole DEPENDS white
|
||||||
|
keyword whole TARGETS white
|
||||||
|
keyword whole LIBRARY white
|
||||||
|
keyword whole DESTINATION white
|
||||||
|
keyword whole PROPERTIES white
|
||||||
|
keyword whole LIBRARY_OUTPUT_DIRECTORY white
|
||||||
|
keyword whole RUNTIME_OUTPUT_DIRECTORY white
|
||||||
|
|
||||||
|
keyword whole VERSION white
|
||||||
|
keyword whole COMPONENTS white
|
||||||
|
keyword whole REQUIRED white
|
||||||
|
|
||||||
|
spellcheck
|
||||||
|
|
||||||
|
context # \n brown
|
||||||
|
|
||||||
|
context " " green
|
||||||
|
keyword ${\[^}\]+} brightgreen
|
||||||
|
|
||||||
|
spellcheck
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:5675824d0662144a929215ddda3f627c7b58a91c48759285f63a6bbf6ed55957
|
|
||||||
size 1965523
|
|
3
mc-4.8.1.1.tar.xz
Normal file
3
mc-4.8.1.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:94d307bfd979ed62bdf14f2bab8ca97327526bdd27a9d4bc5c810889e89e85e2
|
||||||
|
size 2012644
|
11
mc-Syntax.cmake.patch
Normal file
11
mc-Syntax.cmake.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- misc/syntax/Syntax.orig 2011-07-19 12:35:07.000000000 +0400
|
||||||
|
+++ misc/syntax/Syntax 2011-12-15 19:07:39.177893268 +0400
|
||||||
|
@@ -241,5 +241,8 @@
|
||||||
|
file ..\*\\.(l|y|yxx|ypp)$ Lex/Flex/Yacc/Bison\ssource
|
||||||
|
include yxx.syntax
|
||||||
|
|
||||||
|
+file (^CMakeLists.txt|.cmake)$ CMake
|
||||||
|
+include cmake.syntax
|
||||||
|
+
|
||||||
|
file .\* unknown
|
||||||
|
include unknown.syntax
|
11
mc-apps-mediainfo.patch
Normal file
11
mc-apps-mediainfo.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -ru misc.orig/mc.ext.in misc/mc.ext.in
|
||||||
|
--- misc.orig/mc.ext.in 2011-02-05 17:54:56.000000000 +0300
|
||||||
|
+++ misc/mc.ext.in 2011-03-06 10:51:12.340002584 +0300
|
||||||
|
@@ -471,6 +471,7 @@
|
||||||
|
Open=(mplayer %f >/dev/null 2>&1 &)
|
||||||
|
#Open=(gtv %f >/dev/null 2>&1 &)
|
||||||
|
#Open=(xanim %f >/dev/null 2>&1 &)
|
||||||
|
+ View=%view{ascii} which mediainfo > /dev/null 2>&1 && mediainfo %f || file %f
|
||||||
|
|
||||||
|
|
||||||
|
### Documents ###
|
13
mc-apps-torrent.patch
Normal file
13
mc-apps-torrent.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff -ru misc.orig/mc.ext.in misc/mc.ext.in
|
||||||
|
--- misc.orig/mc.ext.in 2011-02-05 17:54:56.000000000 +0300
|
||||||
|
+++ misc/mc.ext.in 2011-03-13 16:03:47.162150180 +0300
|
||||||
|
@@ -652,5 +652,8 @@
|
||||||
|
|
||||||
|
+regex/\.torrent$
|
||||||
|
+ View=%view{ascii} which transmission-show > /dev/null 2>&1 && transmission-show %f || file %f
|
||||||
|
+
|
||||||
|
### Default ###
|
||||||
|
|
||||||
|
# Default target for anything not described above
|
||||||
|
default/*
|
||||||
|
|
@ -1,17 +1,15 @@
|
|||||||
Index: misc/mc.ext.in
|
--- misc/mc.ext.in.orig 2012-03-19 20:26:22.000000000 +0400
|
||||||
===================================================================
|
+++ misc/mc.ext.in 2012-03-20 19:56:03.372083301 +0400
|
||||||
--- misc/mc.ext.in.orig 2010-07-05 21:12:51.000000000 +0200
|
@@ -121,7 +121,7 @@
|
||||||
+++ misc/mc.ext.in 2010-07-06 18:46:11.131015545 +0200
|
# Open=%cd %p/utar://
|
||||||
@@ -115,7 +115,7 @@ regex/\.tar\.bz$
|
|
||||||
# Open=%cd %p#utar
|
|
||||||
View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -
|
View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -
|
||||||
|
|
||||||
-regex/\.t(ar\.bz2|bz2?|b2)$
|
-regex/\.t(ar\.bz2|bz2?|b2)$
|
||||||
+regex/\.t(ar\.bz2|bz2?|b2|bz2)$
|
+regex/\.t(ar\.bz2|bz2?|b2|bz2)$
|
||||||
Open=%cd %p#utar
|
Open=%cd %p/utar://
|
||||||
View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
|
View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
|
||||||
|
|
||||||
@@ -391,7 +391,7 @@ shell/.ico
|
@@ -403,7 +403,7 @@
|
||||||
Include=image
|
Include=image
|
||||||
|
|
||||||
include/image
|
include/image
|
||||||
@ -20,7 +18,7 @@ Index: misc/mc.ext.in
|
|||||||
View=%view{ascii} identify %f
|
View=%view{ascii} identify %f
|
||||||
#View=%view{ascii} asciiview %f
|
#View=%view{ascii} asciiview %f
|
||||||
|
|
||||||
@@ -409,11 +409,11 @@ regex/\.([wW][aA][wW]22)$
|
@@ -421,11 +421,11 @@
|
||||||
Open=vplay -s 22 %f
|
Open=vplay -s 22 %f
|
||||||
|
|
||||||
regex/\.([mM][pP]3)$
|
regex/\.([mM][pP]3)$
|
||||||
@ -34,7 +32,7 @@ Index: misc/mc.ext.in
|
|||||||
View=%view{ascii} ogginfo %s
|
View=%view{ascii} ogginfo %s
|
||||||
|
|
||||||
regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
|
regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
|
||||||
@@ -478,12 +478,12 @@ include/video
|
@@ -497,12 +497,12 @@
|
||||||
|
|
||||||
# Postscript
|
# Postscript
|
||||||
type/^PostScript
|
type/^PostScript
|
||||||
@ -49,7 +47,7 @@ Index: misc/mc.ext.in
|
|||||||
#Open=(acroread %f &)
|
#Open=(acroread %f &)
|
||||||
#Open=(ghostview %f &)
|
#Open=(ghostview %f &)
|
||||||
View=%view{ascii} pdftotext %f -
|
View=%view{ascii} pdftotext %f -
|
||||||
@@ -498,48 +498,44 @@ regex/\.([hH][tT][mM][lL]?)$
|
@@ -517,48 +517,44 @@
|
||||||
|
|
||||||
# StarOffice 5.2
|
# StarOffice 5.2
|
||||||
shell/.sdw
|
shell/.sdw
|
||||||
@ -108,12 +106,12 @@ Index: misc/mc.ext.in
|
|||||||
View=%view{ascii} dvi2tty %f
|
View=%view{ascii} dvi2tty %f
|
||||||
|
|
||||||
# TeX
|
# TeX
|
||||||
@@ -548,7 +544,7 @@ regex/\.([Tt][Ee][Xx])$
|
@@ -567,7 +563,7 @@
|
||||||
|
|
||||||
# DjVu
|
# DjVu
|
||||||
regex/\.(djvu|DJVU)$
|
regex/\.(djvu?|DJVU?)$
|
||||||
- Open=djview %f &
|
- Open=djview %f &
|
||||||
+ Open=djview %f >/dev/null 2>&1 &
|
+ Open=djview %f >/dev/null 2>&1 &
|
||||||
|
View=%view{ascii} djvused -e print-pure-txt %f
|
||||||
|
|
||||||
### Miscellaneous ###
|
### Miscellaneous ###
|
||||||
|
|
||||||
|
@ -1,27 +1,16 @@
|
|||||||
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
|
Index: misc/mc.ext.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- misc/mc.ext.in.orig 2010-07-07 14:39:08.723510066 +0200
|
--- 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
|
+++ misc/mc.ext.in 2010-07-07 14:55:35.231010197 +0200
|
||||||
@@ -226,8 +226,8 @@ regex/\.rpm$
|
@@ -226,8 +226,10 @@ regex/\.rpm$
|
||||||
|
|
||||||
# deb
|
# deb
|
||||||
regex/\.u?deb$
|
regex/\.u?deb$
|
||||||
- Open=%cd %p#deb
|
- Open=%cd %p/deb://
|
||||||
- View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
|
- View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
|
||||||
+ Open=%cd %p#uar
|
+# 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
|
+ View=%view{ascii} file %f && nm %f
|
||||||
|
|
||||||
# dpkg
|
# dpkg
|
||||||
|
@ -3,8 +3,7 @@ Index: lib/tty/key.c
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- lib/tty/key.c.orig
|
--- lib/tty/key.c.orig
|
||||||
+++ lib/tty/key.c
|
+++ lib/tty/key.c
|
||||||
@@ -969,10 +969,13 @@ correct_key_code (int code)
|
@@ -969,9 +969,12 @@ correct_key_code (int code)
|
||||||
mod = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- /* F0 is the same as F10 for out purposes */
|
- /* F0 is the same as F10 for out purposes */
|
||||||
@ -32,7 +31,7 @@ Index: lib/tty/key.c
|
|||||||
+ mod &= ~KEY_M_MASK;
|
+ mod &= ~KEY_M_MASK;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
if (!alternate_plus_minus)
|
if (!mc_global.tty.alternate_plus_minus)
|
||||||
switch (c)
|
switch (c)
|
||||||
{
|
{
|
||||||
@@ -1724,7 +1737,7 @@ get_key_code (int no_delay)
|
@@ -1724,7 +1737,7 @@ get_key_code (int no_delay)
|
||||||
|
@ -10,10 +10,10 @@ Index: misc/syntax/spec.syntax
|
|||||||
keyword whole Vendor: green
|
keyword whole Vendor: green
|
||||||
keyword whole Version: green
|
keyword whole Version: green
|
||||||
keyword whole U\{Rr\}\{Ll\}: green
|
keyword whole U\{Rr\}\{Ll\}: green
|
||||||
Index: lib/vfs/mc-vfs/extfs/rpm
|
Index: src/vfs/extfs/helpers/rpm
|
||||||
===================================================================
|
===================================================================
|
||||||
--- lib/vfs/mc-vfs/extfs/rpm.orig
|
--- src/vfs/extfs/helpers/rpm.orig
|
||||||
+++ lib/vfs/mc-vfs/extfs/rpm
|
+++ src/vfs/extfs/helpers/rpm
|
||||||
@@ -153,8 +153,14 @@ mcrpmfs_list_fastRPM ()
|
@@ -153,8 +153,14 @@ mcrpmfs_list_fastRPM ()
|
||||||
echo "$FILEPREF 0 $DATE INFO/EPOCH"
|
echo "$FILEPREF 0 $DATE INFO/EPOCH"
|
||||||
echo "$FILEPREF 0 $DATE INFO/LICENSE"
|
echo "$FILEPREF 0 $DATE INFO/LICENSE"
|
||||||
|
15
mc.changes
15
mc.changes
@ -1,3 +1,18 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 21 06:33:55 UTC 2012 - subchaser1@gmail.com
|
||||||
|
|
||||||
|
- Update to 4.8.1.1. Major changes is:
|
||||||
|
* License version updated to GPL3+ (#1551)
|
||||||
|
* Configuration files was moved from your $HOME/.mc directory into
|
||||||
|
XDG_CONFIG_* directories to respect FDO standard
|
||||||
|
* VFS structure and paths is changed
|
||||||
|
* keybinding names was renamed to provide some unification
|
||||||
|
The changes since 4.7.5 are to numerous to list here.
|
||||||
|
Please see the file NEWS in the documentation for a complete list.
|
||||||
|
- an CMake language syntax highlighting for mcedit added
|
||||||
|
- added .torrent extension
|
||||||
|
- use meadiainfo (if exists) to view multimemedia files
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 3 09:00:29 UTC 2012 - dlovasko@suse.com
|
Fri Feb 3 09:00:29 UTC 2012 - dlovasko@suse.com
|
||||||
|
|
||||||
|
81
mc.spec
81
mc.spec
@ -15,19 +15,24 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
Name: mc
|
Name: mc
|
||||||
Summary: Midnight Commander
|
Summary: Midnight Commander
|
||||||
License: GPL-2.0+
|
License: GPL-3.0+
|
||||||
Group: Productivity/File utilities
|
Group: Productivity/File utilities
|
||||||
Url: http://www.midnight-commander.org/
|
Url: http://www.midnight-commander.org/
|
||||||
Version: 4.7.5.3
|
Version: 4.8.1.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Source: mc-%{version}.tar.lzma
|
Source: mc-%{version}.tar.xz
|
||||||
Source1: x11_browser
|
Source1: x11_browser
|
||||||
Source2: %{name}.desktop
|
Source2: %{name}.desktop
|
||||||
Source3: %{name}.png
|
Source3: %{name}.png
|
||||||
|
Source4: cmake.syntax
|
||||||
|
Patch18: mc-Syntax.cmake.patch
|
||||||
Patch0: mc-fix_lib_search_path.patch
|
Patch0: mc-fix_lib_search_path.patch
|
||||||
Patch6: mc-apps.patch
|
Patch6: mc-apps.patch
|
||||||
|
Patch61: mc-apps-mediainfo.patch
|
||||||
|
Patch62: mc-apps-torrent.patch
|
||||||
Patch7: mc-palmsupport.patch
|
Patch7: mc-palmsupport.patch
|
||||||
Patch8: mc-word_docs.patch
|
Patch8: mc-word_docs.patch
|
||||||
Patch9: mc-x11browser.diff
|
Patch9: mc-x11browser.diff
|
||||||
@ -68,8 +73,8 @@ BuildRequires: readline-devel
|
|||||||
BuildRequires: recode
|
BuildRequires: recode
|
||||||
BuildRequires: slang-devel
|
BuildRequires: slang-devel
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: xorg-x11-devel
|
|
||||||
BuildRequires: xdg-utils
|
BuildRequires: xdg-utils
|
||||||
|
BuildRequires: xorg-x11-devel
|
||||||
BuildRequires: xz
|
BuildRequires: xz
|
||||||
Requires(pre): permissions
|
Requires(pre): permissions
|
||||||
Recommends: %{name}-lang = %{version}
|
Recommends: %{name}-lang = %{version}
|
||||||
@ -100,12 +105,15 @@ target directory.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0
|
%patch0
|
||||||
%patch6
|
%patch6
|
||||||
|
%patch61
|
||||||
|
%patch62
|
||||||
%patch7
|
%patch7
|
||||||
%patch8
|
%patch8
|
||||||
%patch9
|
%patch9
|
||||||
%patch12
|
%patch12
|
||||||
%patch16
|
%patch16
|
||||||
%patch17
|
%patch17
|
||||||
|
%patch18
|
||||||
%patch20
|
%patch20
|
||||||
%patch24
|
%patch24
|
||||||
%patch30
|
%patch30
|
||||||
@ -116,59 +124,6 @@ target directory.
|
|||||||
%patch51
|
%patch51
|
||||||
%patch52 -p1
|
%patch52 -p1
|
||||||
|
|
||||||
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 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 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 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
|
autoreconf --force --install
|
||||||
%define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security -Wno-unused-parameter
|
%define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security -Wno-unused-parameter
|
||||||
@ -183,8 +138,9 @@ make %{?jobs:-j%{jobs}}
|
|||||||
make DESTDIR=%{buildroot} install
|
make DESTDIR=%{buildroot} install
|
||||||
# clean up this setuid problem for now
|
# clean up this setuid problem for now
|
||||||
chmod 755 %{buildroot}/%{_libexecdir}/mc/cons.saver
|
chmod 755 %{buildroot}/%{_libexecdir}/mc/cons.saver
|
||||||
# copy Korean mc hint message,
|
|
||||||
# install -m 0644 %{SOURCE3} %{datadir}/mc/
|
install -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/mc/syntax/
|
||||||
|
|
||||||
#install the shell functions for bourne shell and csh
|
#install the shell functions for bourne shell and csh
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
|
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
|
||||||
ln -fs -t %{buildroot}%{_sysconfdir}/profile.d %{_datadir}/mc/mc.{,c}sh
|
ln -fs -t %{buildroot}%{_sysconfdir}/profile.d %{_datadir}/mc/mc.{,c}sh
|
||||||
@ -201,7 +157,7 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask
|
|||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%run_permissions
|
%set_permissions %{_libexecdir}/mc/cons.saver
|
||||||
|
|
||||||
%verifyscript
|
%verifyscript
|
||||||
%verify_permissions -e %{_libexecdir}/mc/cons.saver
|
%verify_permissions -e %{_libexecdir}/mc/cons.saver
|
||||||
@ -218,7 +174,7 @@ rm -rf %{buildroot}
|
|||||||
%config %{_sysconfdir}/mc/mc.ext
|
%config %{_sysconfdir}/mc/mc.ext
|
||||||
%config %{_sysconfdir}/mc/mc.keymap.emacs
|
%config %{_sysconfdir}/mc/mc.keymap.emacs
|
||||||
%config %{_sysconfdir}/mc/edit.spell.rc
|
%config %{_sysconfdir}/mc/edit.spell.rc
|
||||||
%config %{_sysconfdir}/mc/cedit.menu
|
%config %{_sysconfdir}/mc/mcedit.menu
|
||||||
%config %{_sysconfdir}/mc/mc.keymap.default
|
%config %{_sysconfdir}/mc/mc.keymap.default
|
||||||
%config %{_sysconfdir}/mc/mc.keymap
|
%config %{_sysconfdir}/mc/mc.keymap
|
||||||
%config %{_sysconfdir}/mc/edit.indent.rc
|
%config %{_sysconfdir}/mc/edit.indent.rc
|
||||||
@ -230,11 +186,14 @@ rm -rf %{buildroot}
|
|||||||
%{_datadir}/mc/mc.charsets
|
%{_datadir}/mc/mc.charsets
|
||||||
%{_datadir}/mc/mc.lib
|
%{_datadir}/mc/mc.lib
|
||||||
%{_libexecdir}/mc
|
%{_libexecdir}/mc
|
||||||
|
%{_datadir}/mc/hints/mc.hint
|
||||||
%exclude %{_datadir}/mc/hints/mc.hint.*
|
%exclude %{_datadir}/mc/hints/mc.hint.*
|
||||||
|
%{_datadir}/mc/help/mc.hlp
|
||||||
%exclude %{_datadir}/mc/help/mc.hlp.*
|
%exclude %{_datadir}/mc/help/mc.hlp.*
|
||||||
%exclude %{_sysconfdir}/mc/mc.menu.*
|
%exclude %{_sysconfdir}/mc/mc.menu.*
|
||||||
%{_datadir}/applications/%{name}.desktop
|
%{_datadir}/applications/%{name}.desktop
|
||||||
%{_datadir}/pixmaps/%{name}.png
|
%{_datadir}/pixmaps/%{name}.png
|
||||||
|
%exclude %{_sysconfdir}/mc/mc.menu.*
|
||||||
|
|
||||||
%files lang -f %{name}.lang
|
%files lang -f %{name}.lang
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user