patch by Robert-Andre to install the binaries to /usr/libexec

This commit is contained in:
Qianqian Fang 2019-10-10 19:21:30 -04:00
parent 6051b5a210
commit f09a58c8af
1 changed files with 42 additions and 24 deletions

View File

@ -2,9 +2,13 @@
Name: octave-%{octpkg}
Version: 1.9.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A 3D surface and volumetric mesh generator for MATLAB/Octave
License: GPLv3+
# Main package: GPLv3+
# JMeshLib: GPLv2
# Tetgen: AGPLv3+
License: GPLv3+ and GPLv2 and AGPLv3+
URL: http://iso2mesh.sf.net
# the following utilities are called internally by iso2mesh (stored under a private folder),
# this is needed for making outputs reproducible
@ -283,14 +287,21 @@ mv img2mesh.fig inst/
%build
%set_build_flags
cd tools
pushd tools
# can't use %make_build below because parallel make with CGAL exhausts
# vm's memory and crash the building process, use sequential make instead
make
cd ../bin
popd
pushd bin
ln -s tetgen1.5 tetgen
cd ../
mv bin inst
popd
mkdir inst/bin
pushd bin
for exec in *; do
ln -s %{_libexecdir}/%{octpkg}/$exec ../inst/bin/$exec
done
popd
%octave_pkg_build
%if 0%{?fedora} <=30
@ -299,6 +310,8 @@ mv bin inst
%install
%octave_pkg_install
install -m 0755 -vd %{buildroot}%{_libexecdir}/%{octpkg}
install -m 0755 -vp bin/* %{buildroot}%{_libexecdir}/%{octpkg}/
%post
%octave_cmd pkg rebuild
@ -318,6 +331,7 @@ mv bin inst
%dir %{octpkgdir}
%dir %{octpkgdir}/doc
%dir %{octpkgdir}/bin
%{_libexecdir}/%{octpkg}
%{octpkgdir}/doc/*
%{octpkgdir}/bin/*
%{octpkgdir}/*.m
@ -330,5 +344,9 @@ mv bin inst
%doc sample
%changelog
* Wed Oct 10 2019 Qianqian Fang <fangqq@gmail.com> - 1.9.1-2
- Fix licenses
- Move binaries to libexec
* Wed Oct 02 2019 Qianqian Fang <fangqq@gmail.com> - 1.9.1-1
- Initial package