- rel 5; libexecdir fixes

diff --git a/octave.spec b/octave.spec
index b9e20acbbac83518b6f47ce381d1b46db2212d0d..bb52f00e0ebd1ec67c2acd5b2e63e0b6fa128ac1 100644 (file)
--- a/octave.spec
+++ b/octave.spec
@@ -23,7 +23,7 @@ Summary(sv.UTF-8):    GNU Octave - ett högninvåspråk för numeriska beräkningar
 Summary(zh_CN.UTF-8):  GNU Octave - 用于数字计算的高级语言。
 Name:          octave
 Version:       4.2.1
-Release:       4
+Release:       5
 Epoch:         2
 License:       GPL v3+
 Group:         Applications/Math
@@ -425,27 +425,31 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/liboctave.so.4
 %attr(755,root,root) %{_libdir}/liboctinterp.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liboctinterp.so.4
+%dir %{_libexecdir}/octave
+%dir %{_libexecdir}/octave/%{version}
+%dir %{_libexecdir}/octave/%{version}/exec
+%dir %{_libexecdir}/octave/%{version}/exec/*-pld-linux-gnu*
+%dir %{_libexecdir}/octave/%{version}/site
+%dir %{_libexecdir}/octave/%{version}/site/exec
+%dir %{_libexecdir}/octave/%{version}/site/exec/*-pld-linux-gnu*
+%dir %{_libexecdir}/octave/%{api_dir}
+%dir %{_libexecdir}/octave/%{api_dir}/site
+%dir %{_libexecdir}/octave/%{api_dir}/site/exec
+%dir %{_libexecdir}/octave/%{api_dir}/site/exec/*-pld-linux-gnu*
+%dir %{_libexecdir}/octave/site
+%dir %{_libexecdir}/octave/site/exec
+%dir %{_libexecdir}/octave/site/exec/*-pld-linux-gnu*
 %dir %{_libdir}/octave
 %dir %{_libdir}/octave/%{version}
-%dir %{_libdir}/octave/%{version}/exec
-%dir %{_libdir}/octave/%{version}/exec/*-pld-linux-gnu*
 %dir %{_libdir}/octave/%{version}/oct
 %dir %{_libdir}/octave/%{version}/oct/*-pld-linux-gnu*
 %{_libdir}/octave/%{version}/oct/*-pld-linux-gnu*/*.oct
 %{_libdir}/octave/%{version}/oct/*-pld-linux-gnu*/PKG_ADD
 %dir %{_libdir}/octave/%{version}/site
-%dir %{_libdir}/octave/%{version}/site/exec
-%dir %{_libdir}/octave/%{version}/site/exec/*-pld-linux-gnu*
 %dir %{_libdir}/octave/%{version}/site/oct
 %dir %{_libdir}/octave/%{version}/site/oct/*-pld-linux-gnu*
-%dir %{_libdir}/octave/%{api_dir}
-%dir %{_libdir}/octave/%{api_dir}/site
-%dir %{_libdir}/octave/%{api_dir}/site/exec
-%dir %{_libdir}/octave/%{api_dir}/site/exec/*-pld-linux-gnu*
 %dir %{_libdir}/octave/packages
 %dir %{_libdir}/octave/site
-%dir %{_libdir}/octave/site/exec
-%dir %{_libdir}/octave/site/exec/*-pld-linux-gnu*
 %dir %{_libdir}/octave/site/oct
 %dir %{_libdir}/octave/site/oct/*-pld-linux-gnu*
 %dir %{_libdir}/octave/site/oct/%{api_dir}
@@ -515,7 +519,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/liboctgui.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liboctgui.so.2
-%attr(755,root,root) %{_libdir}/octave/%{version}/exec/*-pld-linux-gnu*/octave-gui
+%attr(755,root,root) %{_libexecdir}/octave/%{version}/exec/*-pld-linux-gnu*/octave-gui
 %{_datadir}/octave/%{version}/etc/default-qt-settings
 %dir %{_datadir}/octave/%{version}/locale
 %lang(be) %{_datadir}/octave/%{version}/locale/be_BY.qm