Fix ocaml library path

This commit is contained in:
Robin Lee 2019-03-31 22:02:46 +08:00
parent 83a68964ea
commit 4575354860
1 changed files with 7 additions and 3 deletions

View File

@ -1,6 +1,6 @@
Name: ocaml-merlin Name: ocaml-merlin
Version: 3.2.2 Version: 3.2.2
Release: 1%{?dist} Release: 2%{?dist}
Summary: Context sensitive completion for OCaml in Vim and Emacs Summary: Context sensitive completion for OCaml in Vim and Emacs
%global libname %(echo %{name} | sed -e 's/^ocaml-//') %global libname %(echo %{name} | sed -e 's/^ocaml-//')
@ -45,7 +45,7 @@ dune build %{?_smp_mflags}
%install %install
dune install --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir} dune install --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir}/ocaml
# Reinstall vim files to Fedora default location # Reinstall vim files to Fedora default location
mkdir -p %{buildroot}%{vimfiles_root} mkdir -p %{buildroot}%{vimfiles_root}
@ -56,6 +56,7 @@ rmdir %{buildroot}%{_datadir}/%{libname}
rm -fr %{buildroot}%{_prefix}/doc rm -fr %{buildroot}%{_prefix}/doc
%check %check
# Test requirement is not satisfied in Fedora
#dune runtest #dune runtest
@ -63,10 +64,13 @@ rm -fr %{buildroot}%{_prefix}/doc
%doc doc/* featuremap.* README.md CHANGELOG.md %doc doc/* featuremap.* README.md CHANGELOG.md
%license LICENSE_MIT.txt %license LICENSE_MIT.txt
%{_bindir}/* %{_bindir}/*
%{_libdir}/%{libname} %{_libdir}/ocaml/%{libname}
%{_emacs_sitelispdir}/* %{_emacs_sitelispdir}/*
%{vimfiles_root}/*/* %{vimfiles_root}/*/*
%changelog %changelog
* Sun Mar 31 2019 Robin Lee <cheeselee@fedoraproject.org> - 3.2.2-2
- Fix ocaml library path
* Fri Mar 1 2019 Robin Lee <cheeselee@fedoraproject.org> - 3.2.2-1 * Fri Mar 1 2019 Robin Lee <cheeselee@fedoraproject.org> - 3.2.2-1
- Initial packaging - Initial packaging