Accepting request 595365 from Base:System

OBS-URL: https://build.opensuse.org/request/show/595365
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=72

mc.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 10 11:57:16 UTC 2018 - adam.majer@suse.de
+
+- xls2csv_update.patch: fix mc to call xls2csv correctly
+  (bsc#1087708)
+
 -------------------------------------------------------------------
 Tue Nov 28 16:42:07 UTC 2017 - ecsos@opensuse.org
 

mc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mc
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -61,6 +61,8 @@ Patch52:        mc-pie.patch
 # mc-startup-timeout.patch mc3082 nadvornik@suse.cz - fix for long timeout on startup, bnc#824729
 Patch60:        mc-startup-timeout.patch
 
+Patch100:       xls2csv_update.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  audiofile-devel
 BuildRequires:  e2fsprogs-devel
@@ -124,6 +126,7 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64`  %{SOU
 %patch41 -p1
 %patch52 -p1
 %patch60 -p1
+%patch100 -p1
 
 %build
 autoreconf --force --install

xls2csv_update.patch

@@ -0,0 +1,17 @@
+Author: Adam Majer
+Upstream: http://midnight-commander.org/ticket/3912
+Bugzilla: 1087708
+
+Index: mc-4.8.11/misc/ext.d/doc.sh.in
+===================================================================
+--- mc-4.8.11.orig/misc/ext.d/doc.sh.in
++++ mc-4.8.11/misc/ext.d/doc.sh.in
+@@ -68,7 +68,7 @@ do_view_action() {
+             elinks -dump "$tmp/page.html"
+             rm -rf "$tmp"
+         } || \
+-            xls2csv "${MC_EXT_FILENAME}" || \
++            xls2csv -c - -x "${MC_EXT_FILENAME}" || \
+             strings "${MC_EXT_FILENAME}"
+         ;;
+     dvi)