rpms/mfiler3/F-9 mfiler3-2.0.8a-use-external.patch, NONE, 1.1 mfiler3.spec, 1.11, 1.12

Sat Sep 27 08:26:43 UTC 2008

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8399/F-9

Modified Files:
	mfiler3.spec 
Added Files:
	mfiler3-2.0.8a-use-external.patch 
Log Message:
* Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-3
- Better system-wide cmigemo patch


mfiler3-2.0.8a-use-external.patch:

--- NEW FILE mfiler3-2.0.8a-use-external.patch ---
--- mfiler3/Makefile.in.cmigemo	2008-09-27 15:52:38.000000000 +0900
+++ mfiler3/Makefile.in	2008-09-27 17:09:26.000000000 +0900
@@ -19,6 +19,7 @@
 COMPILED_INCONIG=@COMPILED_INCONIG@
 
 LIBMIGEMO=@LIBMIGEMO@
+SYSTEM_MIGEMODIR=@SYSTEM_MIGEMODIR@
 
 RUBY=@RUBY@
 LIBRUBY=@LIBRUBY@
@@ -122,7 +123,16 @@
 ###############################################################################
 # ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«
 ###############################################################################
-install:
+ifdef SYSTEM_MIGEMODIR
+migemodir = $(SYSTEM_MIGEMODIR)
+else
+INSTALL_MIGEMO = install_migemo
+migemodir = $(datadir)/mfiler
+endif
+
+install: install_mf3 $(INSTALL_MIGEMO)
+
+install_mf3:
 	mkdir -p $(bindir)
 	mkdir -p $(sysconfdir)
 	mkdir -p $(datadir)/mfiler/cp932
@@ -135,17 +145,19 @@
 	$(INSTALL) -m 644 src/etc/.mfiler3 "$(sysconfdir)"
 	$(INSTALL) -m 644 src/etc/.mfiler3.rb "$(sysconfdir)"
 	$(INSTALL) -m 644 src/etc/completion.rb "$(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"
+
+install_migemo:
+	$(INSTALL) -m 644 migemo-dic/cp932/han2zen.dat "$(migemodir)/cp932"
+	$(INSTALL) -m 644 migemo-dic/cp932/hira2kata.dat "$(migemodir)/cp932"
+	$(INSTALL) -m 644 migemo-dic/cp932/migemo-dict "$(migemodir)/cp932"
+	$(INSTALL) -m 644 migemo-dic/cp932/roma2hira.dat "$(migemodir)/cp932"
+	$(INSTALL) -m 644 migemo-dic/euc-jp/han2zen.dat "$(migemodir)/euc-jp"
+	$(INSTALL) -m 644 migemo-dic/euc-jp/hira2kata.dat "$(migemodir)/euc-jp"
+	$(INSTALL) -m 644 migemo-dic/euc-jp/migemo-dict "$(migemodir)/euc-jp"
+	$(INSTALL) -m 644 migemo-dic/euc-jp/roma2hira.dat "$(migemodir)/euc-jp"
+	$(INSTALL) -m 644 migemo-dic/utf-8/han2zen.dat "$(migemodir)/utf-8"
+	$(INSTALL) -m 644 migemo-dic/utf-8/hira2kata.dat "$(migemodir)/utf-8"
+	$(INSTALL) -m 644 migemo-dic/utf-8/migemo-dict "$(migemodir)/utf-8"
+	$(INSTALL) -m 644 migemo-dic/utf-8/roma2hira.dat "$(migemodir)/utf-8"
 
 
--- mfiler3/config.h.in.cmigemo	2008-06-19 17:21:59.000000000 +0900
+++ mfiler3/config.h.in	2008-09-27 16:40:34.000000000 +0900
@@ -6,6 +6,7 @@
 #undef HAVE_BOEHMGC_H
 #undef HAVE_BOEHMGC2_H
 #undef HAVE_MIGEMO_H
+#undef SYSTEM_MIGEMODIR
 #undef HAVE_CURSES_H
 #undef HAVE_NCURSES_H
 #undef HAVE_ICONV_H
--- mfiler3/configure.in.cmigemo	2008-07-07 11:59:46.000000000 +0900
+++ mfiler3/configure.in	2008-09-27 17:16:12.000000000 +0900
@@ -140,6 +140,19 @@
 AC_SUBST(LIBMIGEMO)
 
 ###############################################################################
+# system wideãªmigemoè¾žæ›¸ã®å ´æ‰€
+###############################################################################
+AC_ARG_WITH(system-migemodir,[ --with-system-migemodir    
+	(specify the directory of system migemo dictionary. /usr/share/migemo, for example)],
+	[ if test "$withval" && test -n $LIBMIGEMO ; then
+		echo "system-migemodir = $withval"
+		SYSTEM_MIGEMODIR="$withval"
+		AC_DEFINE_UNQUOTED(SYSTEM_MIGEMODIR, "$withval")
+       fi ])
+
+AC_SUBST(SYSTEM_MIGEMODIR)
+
+###############################################################################
 # ã‚«ãƒ¼ã‚·ã‚¹
 ###############################################################################
 AC_CHECK_LIB(ncurses, initscr, [NCURSES_LIB="yes"], [NCURSES_LIB="no"])
--- mfiler3/src/isearch.c.cmigemo	2008-06-30 18:10:03.000000000 +0900
+++ mfiler3/src/isearch.c	2008-09-27 17:11:09.000000000 +0900
@@ -273,71 +273,78 @@
 {
 #if defined(HAVE_MIGEMO_H)
     char buf[PATH_MAX];
+    char migemodir[PATH_MAX];
     gMigemo = migemo_open(NULL);
 
     char* datadir = getenv("MFILER3_DATADIR");
 
+#ifdef SYSTEM_MIGEMODIR
+    sprintf(migemodir,"%s", SYSTEM_MIGEMODIR);
+#else
+    sprintf(migemodir, "%s/%s", datadir, "mfiler");
+#endif
+
     if(gKanjiCode == kUtf8) {
-        sprintf(buf, "%s/mfiler/utf-8/migemo-dict", datadir);
+        sprintf(buf, "%s/utf-8/migemo-dict", migemodir);
         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/utf-8/roma2hira.dat", migemodir);
         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/utf-8/hira2kata.dat", migemodir);
         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/utf-8/han2zen.dat", migemodir);
         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/euc-jp/migemo-dict", migemodir);
         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/euc-jp/roma2hira.dat", migemodir);
         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/euc-jp/hira2kata.dat", migemodir);
         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/euc-jp/han2zen.dat", migemodir);
         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/cp932/migemo-dict", migemodir);
         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/cp932/roma2hira.dat", migemodir);
         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/cp932/hira2kata.dat", migemodir);
         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/cp932/han2zen.dat", migemodir);
         if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
             fprintf(stderr, "%s is not found\n", buf);
             exit(1);


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-9/mfiler3.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mfiler3.spec	26 Sep 2008 16:04:17 -0000	1.11
+++ mfiler3.spec	27 Sep 2008 08:26:12 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:		mfiler3
 Version:	2.0.8a
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
@@ -11,7 +11,7 @@
 URL:		http://www.geocities.jp/daisuke530221jp/index3.html
 Source0:	http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
 Source10:	mfiler3.sh
-Patch0:		mfiler3-2.0.5-use-external.patch
+Patch0:		mfiler3-2.0.8a-use-external.patch
 Patch1:		mfiler3-2.0.8a-upgrade-compat.patch
 Patch2:		mfiler3-2.0.8a-signal-define.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +21,8 @@
 BuildRequires:	ncurses-devel
 BuildRequires:	oniguruma-devel
 
+BuildRequires:	autoconf
+
 # ruby-devel requires ruby-libs but does not require ruby
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
@@ -50,6 +52,8 @@
 %patch0 -p1 -b .ext
 %patch1 -p0 -b .upcompat
 %patch2 -p0 -b .arch
+
+autoconf
 # Remove unneeded internal directories to make it sure that
 # we are using external libraries
 %{__rm} -rf \
@@ -62,7 +66,8 @@
 %build
 %configure \
 	--sysconfdir=%{_sysconfdir}/%{name} \
-	--bindir=%{_libexecdir}/%{name}
+	--bindir=%{_libexecdir}/%{name} \
+	--with-system-migemodir=%{_datadir}/cmigemo
 %{__make} %{?_smp_mflags} -k \
 	CC="%{__cc} $RPM_OPT_FLAGS"
 
@@ -99,6 +104,9 @@
 
 
 %changelog
+* Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-3
+- Better system-wide cmigemo patch
+
 * Sat Sep 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.8a-2
 - Fix sparc64 build error
 


