migemo 0.40-5

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7192 ec354946-7b23-47d6-9f5a-488ba84defc7

m/migemo/migemo-install.sh

@@ -28,6 +28,8 @@ SITELISP=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
 EFLAGS="-batch -q"
 COMPILE="-batch -q -f batch-byte-compile"
 
+SOURCES="migemo.el"
+
 case "${FLAVOR}" in
 	emacs|emacs19)
 	;;
@@ -48,23 +50,15 @@ case "${FLAVOR}" in
 #		fi
 #	fi
 
+        # Byte compile
+	cd ${ELDIR}
 	rm -rf ${ELCDIR}
-    install -m 755 -d ${ELCDIR}
-
-    # Byte compile
-    (cd ${ELDIR}
-#	make EMACS=${FLAVOR} .el.elc >  ${ELCDIR}/CompilationLog 2>&1
-### stop running aclocal: 0.40-0vl6
-        touch aclocal.m4 Makefile.in configure
-        ./configure --srcdir=. --with-emacs=${FLAVOR} \
-        --with-lispdir=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} \
-                              >> ${ELCDIR}/CompilationLog 2>&1
-	make install-lispLISP >> ${ELCDIR}/CompilationLog 2>&1
-	make clean-lisp       >> ${ELCDIR}/CompilationLog 2>&1
-	rm -f aclocal.m4 config.cache config.log
-	rm -f ${ELCDIR}/*.el
-    )
-
+	install -m 755 -d ${ELCDIR}
+	cp ${SOURCES} ${ELCDIR}
+	FILES="${SOURCES}"
+	cd ${ELCDIR}
+	${FLAVOR} ${FLAGS} ${FILES} > ${ELCDIR}/CompilationLog 2>&1
+	rm -f ${SOURCES}
 	gzip -9 ${ELCDIR}/CompilationLog
 
 	install -p -m644 ${ELDIR}/vine-default-${PACKAGE}.el ${ELCDIR}

m/migemo/migemo-vl.spec

@@ -3,7 +3,7 @@
 %define   prereq_ge()   %(LC_ALL="C" rpm -q --queryformat 'Requires(post):%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
 %define   origname      migemo
 %define   origver       0.40
-%define   release       4%{?_dist_release}
+%define   release       5%{?_dist_release}
 
 Name:     %{origname}
 Version:  %{origver}
@@ -18,19 +18,15 @@ Source1: migemo-install.sh
 Source2: migemo-remove.sh
 Source3: vine-default-migemo.el
 Source4: migemo-init.el
+Patch0: migemo-el_debian.patch
 URL: http://0xcc.net/migemo/
 BuildArch: noarch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: ruby
-BuildRequires: ruby-bsearch
-BuildRequires: ruby-romkan
 BuildRequires: emacsen
+Requires: cmigemo
 Requires: emacsen
 Requires: apel
 #Requires: ruby >= %{rubyver}
-Requires: ruby
-Requires: ruby-bsearch >= 1.5-0vl4
-Requires: ruby-romkan >= 0.4-0vl3
 Requires(post): emacsen
 Requires(preun): emacsen
 %prereq_ge emacsen-common
@@ -43,12 +39,9 @@ Emacsen 上でローマ字を使って日本語インクリメントサーチを
 
 %prep
 %setup -q -n %{origname}-%{origver}
+%patch0 -p 1 -b .debian
 
 %build
-%configure
-make emacsdir=${RPM_BUILD_ROOT}-%{emacsdir} \
-     lispdir=%{_datadir}/emacs/site-lisp/%{origname} \
-     rubydir=%{rlibdir}
 
 %install
 [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
@@ -58,15 +51,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/%{origname}
 mkdir -p ${RPM_BUILD_ROOT}%{emacsen_pkgdir}/install
 mkdir -p ${RPM_BUILD_ROOT}%{emacsen_pkgdir}/remove
 
-%makeinstall emacsdir=${RPM_BUILD_ROOT}-%{emacsdir} \
-             lispdir=${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/%{origname} \
-             rubydir=${RPM_BUILD_ROOT}%{rlibdir}
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/%{origname}/*.elc
-make clean
-cp -ar Makefile* configure* *.el *.el.in elisp-comp acinclude.m4 \
-      install-sh  mkinstalldirs missing INSTALL NEWS migemo.rb.in \
-      README COPYING AUTHORS ChangeLog tests config.status migemo \
-      %{SOURCE3} %{SOURCE4} \
+%{__cp} -a migemo.el.in \
+      ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/%{origname}/migemo.el
+%{__cp} -a %{SOURCE3} %{SOURCE4} \
       ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/%{origname}
 
 #
@@ -108,15 +95,18 @@ rm -rf ${RPM_BUILD_DIR}/%{origname}-%{origver}
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README tests
-%{_bindir}/migemo*
-%{rlibdir}/migemo*
-%{_datadir}/migemo
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
 %{_datadir}/emacs/site-lisp/%{origname}
 %{emacsen_pkgdir}/install/%{origname}
 %{emacsen_pkgdir}/remove/%{origname}
 
 %changelog
+* Thu Nov 29 2012 IWAI, Masaharu <iwai@alib.jp> 0.40-5
+- using C/Migemo
+  - update Requires and BuildRequires
+  - update migemo-install.sh
+  - update vine-default-migemo.el
+
 * Sun Feb 19 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.40-4
 - updated migemo-init.el
 

m/migemo/vine-default-migemo.el

@@ -9,8 +9,15 @@
 ;; Migemo の設定
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; Migemoのロード
-(load "migemo")
+;; C/Migemo settings
+(setq migemo-command "/usr/bin/cmigemo")
+(setq migemo-options '("-q" "--emacs" "-i" "\g"))
+(setq migemo-dictionary "/usr/share/migemo/utf-8/migemo-dict")
+(setq migemo-user-dictionary nil)
+(setq migemo-regex-dictionary nil)
+(setq migemo-coding-system 'utf-8-unix)
+(load-library "migemo")
+(migemo-init)
 
 ;; Emacs 側でのキャッシュを有効にする
 ;(setq migemo-use-pattern-alist t)