rpms/mfiler3/F-8 mfiler3-1.0.0-debug-warning.patch, NONE, 1.1 mfiler3-1.0.0-fix-crash.patch, NONE, 1.1 mfiler3-1.0.0-use-external.patch, NONE, 1.1 mfiler3.sh, NONE, 1.1 mfiler3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19910/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	mfiler3-1.0.0-debug-warning.patch 
	mfiler3-1.0.0-fix-crash.patch mfiler3-1.0.0-use-external.patch 
	mfiler3.sh mfiler3.spec 
Log Message:
Initial commit

mfiler3-1.0.0-debug-warning.patch:

--- NEW FILE mfiler3-1.0.0-debug-warning.patch ---
--- mfiler3/src/cmdline.c.debug1	2008-06-19 17:49:50.000000000 +0900
+++ mfiler3/src/cmdline.c	2008-06-20 01:44:27.000000000 +0900
@@ -1,5 +1,6 @@
 #include "common.h"
 #include <time.h>
+#include <string.h>
 
 BOOL gCmdLineActive = FALSE;
 
--- mfiler3/src/cmdline_completion.c.debug1	2008-06-19 18:03:05.000000000 +0900
+++ mfiler3/src/cmdline_completion.c	2008-06-20 01:44:27.000000000 +0900
@@ -1,5 +1,6 @@
 #include "common.h"
 #include <dirent.h>
+#include <string.h>
 
 vector_obj* gCCandidate;
 static vector_obj* gCExplanation;
--- mfiler3/src/common.h.debug1	2008-06-19 18:02:54.000000000 +0900
+++ mfiler3/src/common.h	2008-06-20 01:44:27.000000000 +0900
@@ -116,6 +116,7 @@
 void cmdline_history_view();
 void cmdline_history_input(int meta, int key);
 void cmdline_hcandidate_refresh();
+void cmdline_start(char* str, int cursor);
 
 ///////////////////////////////////////////////////////////////////////////////
 // cmdline_completion.c
@@ -148,6 +149,7 @@
 // shell.c
 ///////////////////////////////////////////////////////////////////////////////
 #include "shell.h"
+int shell_load(char* fname, BOOL sub_shell);
 
 ///////////////////////////////////////////////////////////////////////////////
 // command.c
@@ -166,4 +168,7 @@
 BOOL file_copy(char* spath, char* dpath, BOOL move, BOOL preserve);
 BOOL file_remove(char* path, BOOL no_ctrl_c, BOOL msg);
 
+// minato_debug.c
+void P(char* msg, ...);
+
 #endif
--- mfiler3/src/filer.c.debug1	2008-06-19 21:03:23.000000000 +0900
+++ mfiler3/src/filer.c	2008-06-20 01:44:27.000000000 +0900
@@ -6,6 +6,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <string.h>
 
 static const int kMaxYMinus = 4;
 
--- mfiler3/src/gui.c.debug1	2008-06-19 18:18:43.000000000 +0900
+++ mfiler3/src/gui.c	2008-06-20 01:44:27.000000000 +0900
@@ -1,4 +1,6 @@
 #include "common.h"
+#include <ctype.h>
+#include <string.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 // メッセージ表示
--- mfiler3/src/isearch.c.debug1	2008-06-20 01:44:27.000000000 +0900
+++ mfiler3/src/isearch.c	2008-06-20 01:44:27.000000000 +0900
@@ -1,4 +1,5 @@
 #include "common.h"
+#include <string.h>
 
 #if defined(HAVE_MIGEMO_H)
 migemo* gMigemo;
--- mfiler3/src/menu.c.debug1	2008-05-22 22:48:03.000000000 +0900
+++ mfiler3/src/menu.c	2008-06-20 01:44:27.000000000 +0900
@@ -1,4 +1,5 @@
 #include "common.h"
+#include <string.h>
 
 static sMenuItem* sMenuItem_new(char* name, int key, char* cmd) {
     sMenuItem* self = GC_malloc(sizeof(sMenuItem));
--- mfiler3/src/minato_curses.c.debug1	2008-06-19 18:16:03.000000000 +0900
+++ mfiler3/src/minato_curses.c	2008-06-20 01:44:27.000000000 +0900
@@ -1,3 +1,7 @@
+#define _XOPEN_SOURCE 500
+#include <wchar.h>
+#include <sys/select.h>
+
 #include "config.h"
 #include "minato_curses.h"
 #include "minato_vector.h"
--- mfiler3/src/minato_debug.c.debug1	2008-06-06 17:01:00.000000000 +0900
+++ mfiler3/src/minato_debug.c	2008-06-20 01:44:27.000000000 +0900
@@ -1,6 +1,10 @@
+#define _XOPEN_SOURCE 500
+
 #include "minato_debug.h"
 #include <stdio.h>
 #include <limits.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 char* gFileName[PATH_MAX];
 
--- mfiler3/src/minato_extra.c.debug1	2008-06-19 17:29:23.000000000 +0900
+++ mfiler3/src/minato_extra.c	2008-06-20 01:44:27.000000000 +0900
@@ -3,6 +3,8 @@
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
+#include <string.h>
+#include <ctype.h>
 
 #if !defined(HAVE_GCSTRDUP)
 char* GC_strdup(char* str)
--- mfiler3/src/minato_hash.c.debug1	2008-05-20 15:39:07.000000000 +0900
+++ mfiler3/src/minato_hash.c	2008-06-20 01:44:27.000000000 +0900
@@ -1,5 +1,6 @@
 #include "minato_hash.h"
 #include <stdio.h>
+#include <string.h>
 
 //////////////////////////////////////////////////////////////////////////////
 // “à•”ŠÖ”
--- mfiler3/src/minato_kanji.c.debug1	2008-06-14 20:27:48.000000000 +0900
+++ mfiler3/src/minato_kanji.c	2008-06-20 01:44:27.000000000 +0900
@@ -1,7 +1,10 @@
+#define _XOPEN_SOURCE 500
+
 #include "minato_kanji.h"
 #include "minato_curses.h"
 #include <wctype.h>
 #include <stdlib.h>
+#include <string.h>
 
 enum eKanjiCode gKanjiCode = kUtf8;
 char* gKanjiCodeString[6] = {
--- mfiler3/src/minato_string.c.debug1	2008-05-20 15:39:07.000000000 +0900
+++ mfiler3/src/minato_string.c	2008-06-20 01:44:27.000000000 +0900
@@ -1,5 +1,7 @@
 #include "minato_string.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 // ‰Šú‰»
--- mfiler3/src/minato_vector.c.debug1	2008-05-20 15:39:07.000000000 +0900
+++ mfiler3/src/minato_vector.c	2008-06-20 02:00:03.000000000 +0900
@@ -1,4 +1,5 @@
 #include "minato_vector.h"
+#include <string.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 // ‰Šú‰»
@@ -144,7 +145,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // ƒAƒCƒeƒ€‚ðƒ\[ƒg‚·‚é
 ///////////////////////////////////////////////////////////////////////////////
-static quick_sort(vector_obj* self, int left, int right, sort_if fun)
+static void quick_sort(vector_obj* self, int left, int right, sort_if fun)
 {
    int i;
    int j;
--- mfiler3/src/shell.c.debug1	2008-06-19 21:46:04.000000000 +0900
+++ mfiler3/src/shell.c	2008-06-20 01:44:27.000000000 +0900
@@ -9,6 +9,8 @@
 #include <errno.h>
 #include <sys/shm.h>
 #include <glob.h>
+#include <string.h>
+#include <libgen.h>
 
 vector_obj* gJobs;                    // vector of sJob
 sJob* gForgroundJob = NULL;           // ƒtƒHƒAƒOƒ‰ƒ“ƒhƒWƒ‡ƒu

mfiler3-1.0.0-fix-crash.patch:

--- NEW FILE mfiler3-1.0.0-fix-crash.patch ---
--- mfiler3/src/menu.c.debug	2008-06-21 01:21:25.000000000 +0900
+++ mfiler3/src/menu.c	2008-06-21 02:06:05.000000000 +0900
@@ -18,6 +18,7 @@
     self->mCursor = 0;
 
     self->mMenuItems = vector_new(10);
+    return self;
 }
 
 sMenu* gActiveMenu = NULL;

mfiler3-1.0.0-use-external.patch:

--- NEW FILE mfiler3-1.0.0-use-external.patch ---
--- mfiler3/Makefile.in.ext	2008-06-19 23:15:59.000000000 +0900
+++ mfiler3/Makefile.in	2008-06-19 23:15:59.000000000 +0900
@@ -123,17 +123,5 @@
 	$(INSTALL) -m 755 mattr $(bindir)
 	$(INSTALL) -m 755 mdnd $(bindir)
 	$(INSTALL) -m 644 src/etc/.mfiler3 "$(sysconfdir)"
-	$(INSTALL) -m 644 migemo-dic/cp932/han2zen.dat "$(datadir)/mfiler/cp932"
-	$(INSTALL) -m 644 migemo-dic/cp932/hira2kata.dat "$(datadir)/mfiler/cp932"
-	$(INSTALL) -m 644 migemo-dic/cp932/migemo-dict "$(datadir)/mfiler/cp932"
-	$(INSTALL) -m 644 migemo-dic/cp932/roma2hira.dat "$(datadir)/mfiler/cp932"
-	$(INSTALL) -m 644 migemo-dic/euc-jp/han2zen.dat "$(datadir)/mfiler/euc-jp"
-	$(INSTALL) -m 644 migemo-dic/euc-jp/hira2kata.dat "$(datadir)/mfiler/euc-jp"
-	$(INSTALL) -m 644 migemo-dic/euc-jp/migemo-dict "$(datadir)/mfiler/euc-jp"
-	$(INSTALL) -m 644 migemo-dic/euc-jp/roma2hira.dat "$(datadir)/mfiler/euc-jp"
-	$(INSTALL) -m 644 migemo-dic/utf-8/han2zen.dat "$(datadir)/mfiler/utf-8"
-	$(INSTALL) -m 644 migemo-dic/utf-8/hira2kata.dat "$(datadir)/mfiler/utf-8"
-	$(INSTALL) -m 644 migemo-dic/utf-8/migemo-dict "$(datadir)/mfiler/utf-8"
-	$(INSTALL) -m 644 migemo-dic/utf-8/roma2hira.dat "$(datadir)/mfiler/utf-8"
 
 
--- mfiler3/src/isearch.c.ext	2008-06-06 13:24:07.000000000 +0900
+++ mfiler3/src/isearch.c	2008-06-20 00:22:35.000000000 +0900
@@ -277,66 +277,66 @@
     char* datadir = getenv("MFILER3_DATADIR");
 
     if(gKanjiCode == kUtf8) {
-        sprintf(buf, "%s/mfiler/utf-8/migemo-dict", datadir);
+        sprintf(buf, "%s/cmigemo/utf-8/migemo-dict", datadir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_MIGEMO, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/utf-8/roma2hira.dat", datadir);
+        sprintf(buf, "%s/cmigemo/utf-8/roma2hira.dat", datadir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_ROMA2HIRA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/utf-8/hira2kata.dat", datadir);
+        sprintf(buf, "%s/cmigemo/utf-8/hira2kata.dat", datadir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HIRA2KATA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/utf-8/han2zen.dat", datadir);
+        sprintf(buf, "%s/cmigemo/utf-8/han2zen.dat", datadir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
     }
     else if(gKanjiCode == kEucjp) {
-        sprintf(buf, "%s/mfiler/euc-jp/migemo-dict", datadir);
+        sprintf(buf, "%s/cmigemo/euc-jp/migemo-dict", datadir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_MIGEMO, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/euc-jp/roma2hira.dat", datadir);
+        sprintf(buf, "%s/cmigemo/euc-jp/roma2hira.dat", datadir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_ROMA2HIRA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/euc-jp/hira2kata.dat", datadir);
+        sprintf(buf, "%s/cmigemo/euc-jp/hira2kata.dat", datadir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HIRA2KATA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/euc-jp/han2zen.dat", datadir);
+        sprintf(buf, "%s/cmigemo/euc-jp/han2zen.dat", datadir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
     }
     else {
-        sprintf(buf, "%s/mfiler/cp932/migemo-dict", datadir);
+        sprintf(buf, "%s/cmigemo/cp932/migemo-dict", datadir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_MIGEMO, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/cp932/roma2hira.dat", datadir);
+        sprintf(buf, "%s/cmigemo/cp932/roma2hira.dat", datadir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_ROMA2HIRA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/cp932/hira2kata.dat", datadir);
+        sprintf(buf, "%s/cmigemo/cp932/hira2kata.dat", datadir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HIRA2KATA, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);
         }
-        sprintf(buf, "%s/mfiler/cp932/han2zen.dat", datadir);
+        sprintf(buf, "%s/cmigemo/cp932/han2zen.dat", datadir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);


--- NEW FILE mfiler3.sh ---
#!/bin/bash

export PATH="/usr/libexec/mfiler3:$PATH"
exec /usr/libexec/mfiler3/mfiler3 $*


--- NEW FILE mfiler3.spec ---
Name:		mfiler3
Version:	1.0.0
Release:	1%{?dist}
Summary:	Two pane file manager under UNIX console

Group:		Applications/Editors
License:	GPL+
URL:		http://www.geocities.jp/daisuke530221jp/index3.html
Source0:	http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
Source10:	mfiler3.sh
Patch0:		mfiler3-1.0.0-use-external.patch
Patch1:		mfiler3-1.0.0-debug-warning.patch
Patch2:		mfiler3-1.0.0-fix-crash.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	cmigemo-devel
BuildRequires:	gc-devel
BuildRequires:	ncurses-devel
BuildRequires:	oniguruma-devel

%description
Minnu's Filer3 is a two pane file manager under UNIX console.

%package	mdnd
Summary:	Drag and drop support for %{name}
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

Requires:	ruby(gtk2)

%description	mdnd
This package supports drag and drop usage for %{name}.


%prep
%setup -q -n %{name}
%{__sed} -i.strip -e 's| -s -m| -m|' Makefile.in
%{__sed} -i.debuginfo -e 's|-g -w||' configure

%patch0 -p1 -b .ext
%patch1 -p1 -b .warn
%patch2 -p1 -b .return_val
# Remove unneeded internal directories to make it sure that
# we are using external libraries
%{__rm} -rf \
	migemo-dic/ \
	src/onig*/ \

# Remove pre-compiled binary...
%{__rm} -f mattr

%build
extra_flags="-Werror-implicit-function-declaration"

%configure \
	--sysconfdir=%{_sysconfdir}/%{name} \
	--bindir=%{_libexecdir}/%{name}
%{__make} %{?_smp_mflags} -k \
	CC="%{__cc} $RPM_OPT_FLAGS $extra_flags"

%install
%{__rm} -rf $RPM_BUILD_ROOT

# Use %%makeinstall
%makeinstall \
	sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
	bindir=$RPM_BUILD_ROOT%{_libexecdir}/%{name} \
	INSTALL="%{__install} -c -p"

# Install wrapper script
%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
%{__install} -cpm 0755 %SOURCE10 $RPM_BUILD_ROOT%{_bindir}/%{name}


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc	doc/

%config(noreplace)	%{_sysconfdir}/%{name}/
%{_bindir}/%{name}
%{_libexecdir}/%{name}/
%exclude	%{_libexecdir}/%{name}/mdnd

%files	mdnd
%defattr(-,root,root,-)
%{_libexecdir}/%{name}/mdnd


%changelog
* Fri Jun 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0.0-1
- 1.0.0
- Add -Werror-implicit-function-declaration

* Tue Jun  3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.2.1-1
- Initial packaging
- Make mfiler3 parallel installable with mfiler2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jun 2008 15:32:35 -0000	1.1
+++ .cvsignore	21 Jun 2008 16:13:54 -0000	1.2
@@ -0,0 +1 @@
+mfiler3-1.0.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jun 2008 15:32:35 -0000	1.1
+++ sources	21 Jun 2008 16:13:54 -0000	1.2
@@ -0,0 +1 @@
+47b89b52c0b763dfa8683017906f3918  mfiler3-1.0.0.tgz