- adjusted spec and libexec patch to honour libexecdir setting

diff --git a/mecab-libexec.patch b/mecab-libexec.patch
index 743f0feff3200c7b16b497177f5adf14b837b2c8..af33c7c7a54c030a5c21afbe314dfdca15827085 100644 (file)
--- a/mecab-libexec.patch
+++ b/mecab-libexec.patch
@@ -5,7 +5,7 @@
  
      --libexecdir)
 -              echo @prefix@/libexec/mecab
-+              echo @libdir@/mecab
++              echo @libexecdir@/mecab
                ;;
        
      --sysconfdir)

diff --git a/mecab.spec b/mecab.spec
index 2a0239d2243ba73ec53589468c690e4d69362d67..935ae099302a1fe3a746314982cc18642aa48bc3 100644 (file)
--- a/mecab.spec
+++ b/mecab.spec
@@ -78,12 +78,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/mecab
 %attr(755,root,root) %{_libdir}/libmecab.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmecab.so.2
+%dir %{_libexecdir}/mecab
+%attr(755,root,root) %{_libexecdir}/mecab/mecab-cost-train
+%attr(755,root,root) %{_libexecdir}/mecab/mecab-dict-gen
+%attr(755,root,root) %{_libexecdir}/mecab/mecab-dict-index
+%attr(755,root,root) %{_libexecdir}/mecab/mecab-system-eval
+%attr(755,root,root) %{_libexecdir}/mecab/mecab-test-gen
+%if "%{_libdir}" != "%{_libexecdir}"
 %dir %{_libdir}/mecab
-%attr(755,root,root) %{_libdir}/mecab/mecab-cost-train
-%attr(755,root,root) %{_libdir}/mecab/mecab-dict-gen
-%attr(755,root,root) %{_libdir}/mecab/mecab-dict-index
-%attr(755,root,root) %{_libdir}/mecab/mecab-system-eval
-%attr(755,root,root) %{_libdir}/mecab/mecab-test-gen
+%endif
 %dir %{_libdir}/mecab/dic
 %{_mandir}/man1/mecab.1*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mecabrc