[packages/mecab] - adjusted spec and libexec patch to honour libexecdir setting
qboosh
qboosh at pld-linux.org
Sat Mar 17 08:36:02 CET 2018
commit 93eac9f0a33a6ee4b1e6f8ca261fbc478a9c56e7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Mar 17 08:38:48 2018 +0100
- adjusted spec and libexec patch to honour libexecdir setting
mecab-libexec.patch | 2 +-
mecab.spec | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/mecab.spec b/mecab.spec
index 2a0239d..935ae09 100644
--- 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
diff --git a/mecab-libexec.patch b/mecab-libexec.patch
index 743f0fe..af33c7c 100644
--- a/mecab-libexec.patch
+++ b/mecab-libexec.patch
@@ -5,7 +5,7 @@
--libexecdir)
- echo @prefix@/libexec/mecab
-+ echo @libdir@/mecab
++ echo @libexecdir@/mecab
;;
--sysconfdir)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mecab.git/commitdiff/93eac9f0a33a6ee4b1e6f8ca261fbc478a9c56e7
More information about the pld-cvs-commit
mailing list