[mfiler3/f14/master] Fix compilation error with saphire 1.4.0 (and actually fix symbol error) Prefer less over lv for hel

[Mamoru Tasaka]

commit 58ed6af5f431907541ab0d8b969da674a1c13454
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Thu Apr 14 01:10:06 2011 +0900

    Fix compilation error with saphire 1.4.0 (and actually fix
    symbol error)
    Prefer less over lv for help pager

 mfiler3-4.2.7-err-symbol.patch |   11 +++++++++++
 mfiler3.spec                   |   15 ++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/mfiler3-4.2.7-err-symbol.patch b/mfiler3-4.2.7-err-symbol.patch
new file mode 100644
index 0000000..49726e2
--- /dev/null
+++ b/mfiler3-4.2.7-err-symbol.patch
@@ -0,0 +1,11 @@
+--- mfiler3-4.2.7/commands.c.debug	2011-03-08 15:23:40.000000000 +0900
++++ mfiler3-4.2.7/commands.c	2011-04-14 01:02:20.000000000 +0900
+@@ -2227,7 +2227,7 @@
+         string_obj* line = STRING_NEW("");
+         int result = statment_tree_internal_commands_read_nextin_oneline(nextin, line);
+         if(result < 0) {
+-            err_msg("interrupt");
++            merr_msg("interrupt");
+             string_delete(line);
+             return FALSE;
+         }
diff --git a/mfiler3.spec b/mfiler3.spec
index 383420e..9cd06c6 100644
--- a/mfiler3.spec
+++ b/mfiler3.spec
@@ -4,7 +4,7 @@
 
 Name:		mfiler3
 Version:	4.2.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
@@ -12,6 +12,7 @@ License:	GPL+
 URL:		http://www.geocities.jp/daisuke530221jp/index3.html
 Source0:	http://dl.sourceforge.jp/%{name}/%{repoid}/%{name}-%{version}.tgz
 Source10:	mfiler3.sh
+Patch0:		mfiler3-4.2.7-err-symbol.patch
 
 # Obsoletes but not Provides
 Obsoletes:	%{name}-mdnd < 3.0.0
@@ -28,6 +29,7 @@ Minnu's Filer3 is a two pane file manager under UNIX console.
 
 %prep
 %setup -q
+%patch0 -p1 -b .err
 
 # Don't strip, preserve timestamp
 %{__sed} -i.strip -e 's| -s -m| -m|' Makefile.in
@@ -38,6 +40,12 @@ Minnu's Filer3 is a two pane file manager under UNIX console.
 
 %{__rm} -f *.o
 
+# Prefer less over lv
+sed -i.pager \
+	-e 's| lv| less|' \
+	-e 's|lv |less |' \
+	mfiler3.sa
+
 %build
 %configure \
 	CC="gcc -I%{_includedir}/saphire %{optflags}" \
@@ -79,6 +87,11 @@ rm -rf ./Trash
 
 
 %changelog
+* Thu Apr 14 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 4.2.7-2
+- Fix compilation error with saphire 1.4.0 (and actually fix
+  symbol error)
+- Prefer less over lv for help pager
+
 * Sun Apr  3 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 4.2.7-1
 - 4.2.7