Just so it doesn't look derelict, if no one else does I should get a
chance to go over this sometime today or tomorrow.
It looks ok but I want to verify the packaging changes (ie: not so much
the upstream code changes) before accepting.
Holy cow the new comments/discussion feature being developed for obs &
webui sure will be welcome. It was probably more work and more time to
manually assemble this email and cc list than it would have been to just
do the review!
And it still doesn't even do the job since I only mailed mc maintainers,
not everyone who can see the SR and have the ability to accept/deny.
--
bkw
On 7/15/2013 6:14 PM, subchaser@mail.ru wrote:
home:subchaser:midnight-commander:latest/mc -> Base:System/mc
https://build.opensuse.org/request/show/183188
Description: Updated to latest released versions
changes files:
--------------
--- mc.changes
+++ mc.changes
@@ -1,0 +2,89 @@
+Thu Jul 11 15:00:48 UTC 2013 - subchaser1@gmail.com
+
+- Update to 4.8.9 (latest released version)
+
+Major changes since 4.8.8
+VFS
+ extfs: support unrar-5 (#3015)
+ extfs: use xorriso (if exists) for writing into ISO images (#3027)
+
+Editor
+ Support unlimited file size (#1743)
+
+Misc
+ Lot of code cleanups (#2990, #2071, #2164, #2998, #3003, #3005, #3022)
+ Display additional info while viewing (by F3) *.iso files (#2006)
+ New skins:
+ modarin256: set of 256-color skins from Oliver Lange (#2737)
+
+Fixes
+ Fail to link if system lib does not contain strverscmp (#2992)
+ Segfault when mc's temporary directory doesn't belong to the correct user (#3021)
+ Race condition when creating temporary directory (#3025)
+ Mouse doesn't work in screen and tmux (#3011)
+ Incorrect file size in copy/move overwrite query dialog (#3000)
+ Garbage in subshell prompt (#3001)
+ Incorrect WLabel redraw after text change (#2991)
+ Find File: "All charsets" options don't work (#3026)
+ When an unknown key is pressed, it is interpreted as garbage (#2988)
+ Segfault on creating new file in external editor (#3020)
+ Rotating dash is not removed when mc finishes reading the directory (#2163)
+ mcedit: word completion failed if word to be completed is begun from begin of file (#2245)
+ mcview: broken switch between raw and parse modes (#2968)
+ Hex viewer: continue search doesn't work (#2706)
+ sftpfs: broken SSH aliases (#2923)
+
+-------------------------------------------------------------------
+Thu Jun 27 07:42:44 UTC 2013 - subchaser1@gmail.com
+
+- Apply bugfixes from upstream version:
+ * Incorrect file size in copy/move overwrite query dialog (#3000)
+ * Incorrect WLabel redraw after text change (#2991)
+
+-------------------------------------------------------------------
+Tue Apr 2 19:46:19 UTC 2013 - subchaser1@gmail.com
+
+- Update to 4.8.8 (latest released version)
+
+Major changes since 4.8.7
+Core
+ Make copy/move progress dialog window wider up to 2/3 of screen width (#2076)
+ Ask file name before create new file in editor (#2585)
+ Support newer extended mouse protocol SGR-1006 instead of URXVT-1015 (#2956)
+ Allow skip directory scanning before file operation. Print directory count and size in addition to directory name (#2101)
+ Add jump support to target line in some external editors and viewers (#2206)
+
+Editor
+ Update syntax highlighting:
+ Jal programming language (#2855)
+ gplink configuration files (.lkr extension) (#2855)
+ Makefile with .mak extension (#2896)
+ ZSH configuration files (#2950)
+ Fortran (#2962)
+
+Misc
+ Code cleanup (#2944, #2954)
+ Report real compiler in MC_CHECK_ONE_CFLAG instead of 'gcc'
+ Hints files now translated via Transifex (#2980)
+
+Fixes
+ Segfault in file operation due to unhandled regexp error (#2493)
+ Tab completion vs. spaces and escaping (#55)\
+ Special chars are not escaped in autocompletion of filenames (#2626)
+ Buttons in the 'Directory hotlist' window are placed incorrectly (#2958)
+ Mouse doesn't select text in subshell in native console (#2964)
+ Mouse click below non-droppeddown menubar activates menu box (#2971)
+ Insufficient quoting and wrong message in user menu (#2947)
+ mcedit: floating point exception (division by zero) (#2953)
+ mcedit: broken autocompletion (#2957)
+ mcview: broken magic mode (#2976)
+ Broken opening of .war archives (#2974)
+
+-------------------------------------------------------------------
+Sat Mar 9 09:06:35 UTC 2013 - subchaser1@gmail.com
+
+- Update to 4.8.7 (latest released version)
+ The changes since 4.8.1.7 are to numerous to list here.
+ Please see the file NEWS in the documentation for a complete list.
+
+-------------------------------------------------------------------
old:
----
mc-4.8.1.7.tar.xz
mc-apps-mediainfo.patch
mc-apps-torrent.patch
mc-apps.patch
mc-extensions.patch
mc-palmsupport.patch
mc-word_docs.patch
mc-x11browser.diff
new:
----
mc-4.8.9.tar.xz
mc-ext-audio.patch
mc-extd-doc.patch
mc-extd-misc.patch
mc-extd-sound.patch
mc-extd-video.patch
mc-extd-xdg.patch
spec files:
-----------
--- mc.spec
+++ mc.spec
@@ -21,9 +21,9 @@
License: GPL-3.0+
Group: Productivity/File utilities
Url: http://www.midnight-commander.org/
-Version: 4.8.1.7
+Version: 4.8.9
Release: 0.0
-Source: https://www.midnight-commander.org/downloads/mc-%{version}.tar.xz
+Source: http://ftp.midnight-commander.org/mc-%{version}.tar.xz
Source1: x11_browser
Source2: %{name}.desktop
Source3: %{name}.png
@@ -31,12 +31,12 @@
Source5: mc-rpmlintrc
Patch18: mc-Syntax.cmake.patch
Patch0: mc-fix_lib_search_path.patch
-Patch6: mc-apps.patch
-Patch61: mc-apps-mediainfo.patch
-Patch62: mc-apps-torrent.patch
-Patch7: mc-palmsupport.patch
-Patch8: mc-word_docs.patch
-Patch9: mc-x11browser.diff
+Patch61: mc-extd-misc.patch
+Patch62: mc-extd-video.patch
+Patch63: mc-extd-doc.patch
+Patch64: mc-extd-sound.patch
+Patch69: mc-extd-xdg.patch
+Patch71: mc-ext-audio.patch
Patch12: mc-wrapper.patch
Patch16: mc-esc-seq.patch
Patch17: mc-rpm.patch
@@ -50,7 +50,6 @@
# 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
#Patch adding -fpie and -pie to compilation and linking of setuid binaries
Patch52: mc-pie.patch
@@ -105,12 +104,12 @@
%prep
%setup -q
%patch0
-%patch6
%patch61
%patch62
-%patch7
-%patch8
-%patch9
+%patch63
+%patch64
+%patch69
+%patch71
%patch12
%patch16
%patch17
@@ -121,13 +120,15 @@
%patch31
%patch32
%patch41
-%patch50
%patch52 -p1
%build
autoreconf --force --install
%define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security -Wno-unused-parameter
export CFLAGS="$RPM_OPT_FLAGS %{warn_flags}"
+
+export X11_WWW="%{_datadir}/mc/x11_browser"
+
%configure \
--localstatedir=/var/lib \
--enable-charset \
@@ -151,7 +152,9 @@
%suse_update_desktop_file -i %name System FileManager
# Remove not supported language
rm -rf %{buildroot}%{_datadir}/locale/be@tarask
-%{find_lang} %{name}
+
+%find_lang %name
+
%fdupes -s %{buildroot}%{_prefix}
%clean
@@ -168,20 +171,21 @@
%doc ABOUT-NLS COPYING NEWS README
%config %{_sysconfdir}/profile.d/*
%{_bindir}/mc*
-%dir %{_sysconfdir}/mc
+%dir %{_sysconfdir}/mc/
%config %{_sysconfdir}/mc/filehighlight.ini
%config %{_sysconfdir}/mc/sfs.ini
%config %{_sysconfdir}/mc/mc.menu
%config %{_sysconfdir}/mc/mc.ext
-%config %{_sysconfdir}/mc/mc.keymap.emacs
-%config %{_sysconfdir}/mc/edit.spell.rc
+###config #{_sysconfdir}/mc/edit.spell.rc
%config %{_sysconfdir}/mc/mcedit.menu
-%config %{_sysconfdir}/mc/mc.keymap.default
%config %{_sysconfdir}/mc/mc.keymap
+%config %{_sysconfdir}/mc/mc.default.keymap
+%config %{_sysconfdir}/mc/mc.emacs.keymap
%config %{_sysconfdir}/mc/edit.indent.rc
-%dir %{_libexecdir}/mc
+#(!)dir #{_libexecdir}/mc
%verify(not mode) %{_libexecdir}/mc/cons.saver
%{_mandir}/man1/*
+%exclude %{_mandir}/*/man1/*
%{_datadir}/mc
%{_datadir}/mc/syntax/Syntax
%{_datadir}/mc/mc.charsets
@@ -192,18 +196,26 @@
%{_datadir}/mc/help/mc.hlp
%exclude %{_datadir}/mc/help/mc.hlp.*
%exclude %{_sysconfdir}/mc/mc.menu.*
+%exclude %{_datadir}/locale/*/LC_MESSAGES/mc.mo
+
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%exclude %{_sysconfdir}/mc/mc.menu.*
-%files lang -f %{name}.lang
+%files lang -f %name.lang
%defattr(-, root, root)
-%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(hu) %dir %{_mandir}/hu/
+%lang(hu) %dir %{_mandir}/hu/man1/
+%lang(hu) %{_mandir}/hu/man1/mc.1.gz
+
+%lang(pl) %dir %{_mandir}/pl/
+%lang(pl) %dir %{_mandir}/pl/man1/
+%lang(pl) %{_mandir}/pl/man1/mc.1.gz
+
+%lang(sr) %dir %{_mandir}/sr/
+%lang(sr) %dir %{_mandir}/sr/man1/
+%lang(sr) %{_mandir}/sr/man1/mc.1.gz
+
%lang(cs) %doc %{_datadir}/mc/*/mc.*.cs
%lang(es) %doc %{_datadir}/mc/*/mc.*.es
%lang(hu) %doc %{_datadir}/mc/*/mc.*.hu
other changes:
--------------
++++++ mc-4.8.1.7.tar.xz -> mc-4.8.9.tar.xz
(258118 lines skipped)
++++++ mc-Syntax.cmake.patch
--- mc-Syntax.cmake.patch
+++ mc-Syntax.cmake.patch
@@ -1,11 +1,8 @@
--- misc/syntax/Syntax.in.orig 2012-12-28 12:47:48.000000000 +0400
+++ misc/syntax/Syntax.in 2013-03-07 09:36:14.233306543 +0400
-@@ -67,7 +67,7 @@
- file (.\*[Mm]akefile[\\\.A-Za-z0-9]\*|..\*\\.mk|Kbuild)$ Makefile
- include makefile.syntax
+@@ -69,4 +69,4 @@
-file CMakeLists.txt$ CMake
+file (\/CMakeLists.txt|.cmake)$ CMake
include cmake.syntax
- file ..\*\\.(pp|PP|pas|PAS|dpr|DPR|inc|INC)$ Pascal\sProgram
++++++ mc-esc-seq.patch
--- mc-esc-seq.patch
+++ mc-esc-seq.patch
@@ -1,13 +1,11 @@
-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));
+--- lib/util.c.orig 2013-07-09 14:43:17.000000000 +0400
++++ lib/util.c 2013-07-11 18:48:01.258511499 +0400
+@@ -745,6 +745,8 @@
+ while (*(++r) != '\0' && strchr ("0123456789;?", *r) != NULL)
+ ;
}
+ else if (*r == '(')
-+ r++;
++ r++;
else if (*r == ']')
{
/*
++++++ mc-ext-audio.patch (new)
--- mc-ext-audio.patch
+++ mc-ext-audio.patch
@@ -0,0 +1,47 @@
+--- misc/mc.ext.in.orig 2012-12-11 01:04:32.000000000 +0400
++++ misc/mc.ext.in 2013-03-10 10:59:02.741159661 +0400
+@@ -433,16 +433,19 @@
+ ### Sound files ###
+
+ regex/i/\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv)$
+- Open=@EXTHELPERSDIR@/sound.sh open common
++ Include=audio
+
+ regex/i/\.(mod|s3m|xm|it|mtm|669|stm|ult|far)$
+ Open=@EXTHELPERSDIR@/sound.sh open mod
++ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mod
+
+ shell/i/.waw22
+ Open=@EXTHELPERSDIR@/sound.sh open wav22
++ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view wav22
+
+ shell/i/.mp3
+ Open=@EXTHELPERSDIR@/sound.sh open mp3
++ Include=audio
+ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mp3
+
+ regex/i/\.og[gax]$
+@@ -450,15 +453,22 @@
+ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view ogg
+
+ regex/i/\.(spx|flac)$
+- Open=@EXTHELPERSDIR@/sound.sh open common
++ Include=audio
+
+ regex/i/\.(midi?|rmid?)$
+ Open=@EXTHELPERSDIR@/sound.sh open midi
++ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view midi
+
+ shell/i/.wma
+ Open=@EXTHELPERSDIR@/sound.sh open wma
+ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view wma
+
++shell/i/.mka
++ Include=audio
++
++include/audio
++ Open=@EXTHELPERSDIR@/sound.sh open common
++ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view common
+
+ ### Play lists ###
+
++++++ mc-extd-doc.patch (new)
--- mc-extd-doc.patch
+++ mc-extd-doc.patch
@@ -0,0 +1,16 @@
+--- misc/ext.d/doc.sh.in.orig 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/doc.sh.in 2013-03-10 08:03:31.889494487 +0400
+@@ -50,3 +50,3 @@
+ msdoc)
+- which wvHtml >/dev/null 2>&1 &&
++ which wvHtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1 &&
+ {
+@@ -57,2 +57,3 @@
+ } || \
++ wvText "${MC_EXT_FILENAME}" - || \
+ antiword -t "${MC_EXT_FILENAME}" || \
+@@ -63,3 +64,3 @@
+ msxls)
+- which xlHtml >/dev/null 2>&1 && {
++ which xlHtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1 && {
+ tmp=`mktemp -d ${TMPDIR:-/tmp}/%p.XXXXXX`
++++++ mc-extd-misc.patch (new)
--- mc-extd-misc.patch
+++ mc-extd-misc.patch
@@ -0,0 +1,13 @@
+--- misc/ext.d/misc.sh.in.orig 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/misc.sh.in 2013-03-09 12:10:56.696615817 +0400
+@@ -47,3 +47,9 @@
+ torrent)
+- ctorrent -x "${MC_EXT_FILENAME}" 2>/dev/null
++ if type -p ctorrent >/dev/null 2>&1 ; then
++ ctorrent -x "${MC_EXT_FILENAME}" 2>/dev/null
++ elif type -p transmission-show >/dev/null 2>&1 ; then
++ transmission-show "${MC_EXT_FILENAME}"
++ else
++ file "${MC_EXT_FILENAME}"
++ fi
+ ;;
++++++ mc-extd-sound.patch (new)
--- mc-extd-sound.patch
+++ mc-extd-sound.patch
@@ -0,0 +1,56 @@
+--- misc/ext.d/sound.sh.orig 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/sound.sh 2013-03-10 11:54:01.186301679 +0400
+@@ -6,27 +6,46 @@
+ action=$1
+ filetype=$2
+
+-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open"
++[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="_xdg_open"
++
++_xdg_open()
++{
++ if [ -n "$DISPLAY" ] && type -p gmplayer ; then
++ gmplayer "${MC_EXT_FILENAME}"
++ elif type -p mplayer ; then
++ mplayer "${MC_EXT_FILENAME}"
++ else
++ xdg-open "${MC_EXT_FILENAME}"
++ fi
++}
+
+ do_view_action() {
+ filetype=$1
+
++ if type -p mediainfo >/dev/null 2>&1 ; then
++ mediainfo "${MC_EXT_FILENAME}"
++ return $?
++ fi
++
+ case "${filetype}" in
+ mp3)
+- mpg123 -vtn1 "${MC_EXT_FILENAME}" 2>&1 | \
+- sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
++ if type -p mpg123 ; then
++ mpg123 -vtn1 "${MC_EXT_FILENAME}" 2>&1 | \
++ sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
++ return 0
++ fi
+ ;;
+ ogg)
+- ogginfo "${MC_EXT_FILENAME}"
++ type -p ogginfo && ogginfo "${MC_EXT_FILENAME}" && return 0
+ ;;
+ wma)
+ mplayer -quiet -slave -frames 0 -vo null -ao null -identify "${MC_EXT_FILENAME}" 2>/dev/null | \
+ tail +13 || file "${MC_EXT_FILENAME}"
+- ;;
+- *)
+- cat "${MC_EXT_FILENAME}"
++ return $?
+ ;;
+ esac
++
++ mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | sed -n '/^ID_/p'
+ }
+
+ do_open_action() {
++++++ mc-extd-video.patch (new)
--- mc-extd-video.patch
+++ mc-extd-video.patch
@@ -0,0 +1,39 @@
+--- misc/ext.d/video.sh.orig 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/video.sh 2013-03-09 12:29:54.845011661 +0400
+@@ -6,7 +6,18 @@
+ action=$1
+ filetype=$2
+
+-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open"
++[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="_xdg_open"
++
++_xdg_open()
++{
++ if [ -n "$DISPLAY" ] && type -p gmplayer ; then
++ gmplayer "${MC_EXT_FILENAME}"
++ elif type -p mplayer ; then
++ mplayer "${MC_EXT_FILENAME}"
++ else
++ xdg-open "${MC_EXT_FILENAME}"
++ fi
++}
+
+ do_view_action() {
+ filetype=$1
+@@ -13,8 +13,14 @@
+
+ case "${filetype}" in
+ *)
+- mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | \
+- sed -n 's/^ID_//p'
++ if type -p mediainfo >/dev/null 2>&1 ; then
++ mediainfo "${MC_EXT_FILENAME}"
++ elif type -p mplayer >/dev/null 2>&1 ; then
++ mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | \
++ sed -n 's/^ID_//p'
++ else
++ file "${MC_EXT_FILENAME}"
++ fi
+ ;;
+ esac
+ }
++++++ mc-extd-xdg.patch (new)
--- mc-extd-xdg.patch
+++ mc-extd-xdg.patch
@@ -0,0 +1,72 @@
+diff -ru1 misc/ext.d.orig/archive.sh misc/ext.d/archive.sh
+--- misc/ext.d.orig/archive.sh 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/archive.sh 2013-03-10 09:01:31.154705008 +0400
+@@ -145,3 +145,3 @@
+ open)
+- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
++ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ do_open_action "${filetype}" "${pager}"
+diff -ru1 misc/ext.d.orig/doc.sh.in misc/ext.d/doc.sh.in
+--- misc/ext.d.orig/doc.sh.in 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/doc.sh.in 2013-03-10 09:01:48.230710602 +0400
+@@ -189,3 +189,3 @@
+ open)
+- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
++ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ do_open_action "${filetype}"
+diff -ru1 misc/ext.d.orig/image.sh misc/ext.d/image.sh
+--- misc/ext.d.orig/image.sh 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/image.sh 2013-03-10 09:02:00.086714848 +0400
+@@ -56,3 +56,3 @@
+ open)
+- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
++ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ do_open_action "${filetype}"
+diff -ru1 misc/ext.d.orig/misc.sh.in misc/ext.d/misc.sh.in
+--- misc/ext.d.orig/misc.sh.in 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/misc.sh.in 2013-03-10 09:02:13.470718625 +0400
+@@ -90,3 +90,3 @@
+ open)
+- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
++ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ do_open_action "${filetype}"
+diff -ru1 misc/ext.d.orig/package.sh misc/ext.d/package.sh
+--- misc/ext.d.orig/package.sh 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/package.sh 2013-03-10 09:02:23.630723087 +0400
+@@ -53,3 +53,3 @@
+ open)
+- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
++ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ do_open_action "${filetype}"
+diff -ru1 misc/ext.d.orig/sound.sh misc/ext.d/sound.sh
+--- misc/ext.d.orig/sound.sh 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/sound.sh 2013-03-10 09:02:31.222725342 +0400
+@@ -86,3 +86,3 @@
+ open)
+- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
++ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ do_open_action "${filetype}"
+diff -ru1 misc/ext.d.orig/text.sh.in misc/ext.d/text.sh.in
+--- misc/ext.d.orig/text.sh.in 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/text.sh.in 2013-03-10 09:02:39.018727707 +0400
+@@ -135,3 +135,3 @@
+ open)
+- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
++ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ do_open_action "${filetype}" "${pager}"
+diff -ru1 misc/ext.d.orig/video.sh misc/ext.d/video.sh
+--- misc/ext.d.orig/video.sh 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/video.sh 2013-03-10 09:02:48.414731630 +0400
+@@ -45,3 +45,3 @@
+ open)
+- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
++ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ do_open_action "${filetype}"
+diff -ru1 misc/ext.d.orig/web.sh.in misc/ext.d/web.sh.in
+--- misc/ext.d.orig/web.sh.in 2012-12-27 12:13:20.000000000 +0400
++++ misc/ext.d/web.sh.in 2013-03-10 09:02:56.670734093 +0400
+@@ -48,3 +48,3 @@
+ open)
+- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
++ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ do_open_action "${filetype}"
++++++ mc-multi-press-f-keys.patch
--- mc-multi-press-f-keys.patch
+++ mc-multi-press-f-keys.patch
@@ -34,15 +34,15 @@
if (!mc_global.tty.alternate_plus_minus)
switch (c)
{
-@@ -1724,7 +1737,7 @@ get_key_code (int no_delay)
- {
- /* 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
+@@ -1928,7 +1928,7 @@ get_key_code (int no_delay)
+ {
+ /* 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
++++++ mc-rpm.patch
--- mc-rpm.patch
+++ mc-rpm.patch
@@ -18,14 +18,14 @@
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/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/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"
}
++++++ deleted files:
--- mc-apps-mediainfo.patch
--- mc-apps-torrent.patch
--- mc-apps.patch
--- mc-extensions.patch
--- mc-palmsupport.patch
--- mc-word_docs.patch
--- mc-x11browser.diff
To REVIEW against the previous version:
osc request show --diff 183188
To ACCEPT the request:
osc request accept 183188 --message="reviewed ok."
To DECLINE the request:
osc request decline 183188 --message="declined for reason xyz (see ... for background / policy / ...)."
To REVOKE the request:
osc request revoke 183188 --message="retracted because ..., sorry / thx / see better version ..."
--
To unsubscribe, e-mail: opensuse-factory+unsubscribe@opensuse.org
To contact the owner, e-mail: opensuse-factory+owner@opensuse.org