rpms/ocaml-merlin
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to 3.3.1 (BZ#1703452)

Browse Source
This commit is contained in:
Robin Lee 2019-06-28 18:21:12 +08:00
parent 4575354860
commit 71ecd1da1a
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/merlin-3.2.2.tar.gz
/merlin-3.3.1.tar.gz

30
ocaml-merlin.spec
View File

@ -1,21 +1,32 @@
Name: ocaml-merlin
Version: 3.2.2
Release: 2%{?dist}
Version: 3.3.1
Release: 1%{?dist}
Summary: Context sensitive completion for OCaml in Vim and Emacs
%global libname %(echo %{name} | sed -e 's/^ocaml-//')
# The entire source is MIT except orig/ and src/ocaml are QPL
# The entire source is MIT except src/ocaml are QPL
License: MIT and QPL
URL: https://github.com/ocaml/%{libname}
Source0: https://github.com/ocaml/%{libname}/archive/v%{version}/%{libname}-%{version}.tar.gz
BuildRequires: ocaml
BuildRequires: ocaml-dune
BuildRequires: ocaml-dune >= 1.8
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-yojson-devel
BuildRequires: ocaml-biniou-devel
BuildRequires: ocaml-easy-format-devel
# For merlin-lsp
#BuildRequires: ocaml-yojson-devel >= 1.6.0
#BuildRequires: ocaml-menhir-devel
#BuildRequires: ocaml-ppx-deriving-devel
#BuildRequires: ocaml-ppx-deriving-yojson-devel
#BuildRequires: ocaml-ppx-tools-devel
#BuildRequires: ocaml-ppx-derivers-devel
#BuildRequires: ocaml-migrate-parsetree-devel
#BuildRequires: ocaml-result-devel
# Required for tests, not available in Fedora
#BuildRequires: craml
BuildRequires: emacs
@ -41,11 +52,13 @@ much more.
%build
dune build %{?_smp_mflags}
dune build %{_smp_mflags} --build-dir _build_%{libname} -p %{libname}
#dune build --build-dir _build_%{libname}_lsp -p %{libname}-lsp
%install
dune install --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir}/ocaml
dune install --build-dir _build_%{libname} --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir}/ocaml %{libname}
#dune install --build-dir _build_%{libname}_lsp --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir}/ocaml %{libname}-lsp
# Reinstall vim files to Fedora default location
mkdir -p %{buildroot}%{vimfiles_root}
@ -57,7 +70,6 @@ rm -fr %{buildroot}%{_prefix}/doc
%check
# Test requirement is not satisfied in Fedora
#dune runtest
%files
@ -65,10 +77,14 @@ rm -fr %{buildroot}%{_prefix}/doc
%license LICENSE_MIT.txt
%{_bindir}/*
%{_libdir}/ocaml/%{libname}
#%{_libdir}/ocaml/%{libname}-lsp
%{_emacs_sitelispdir}/*
%{vimfiles_root}/*/*
%changelog
* Fri Jun 28 2019 Robin Lee <cheeselee@fedoraproject.org> - 3.3.1-1
- Update to 3.3.1 (BZ#1703452)
* Sun Mar 31 2019 Robin Lee <cheeselee@fedoraproject.org> - 3.2.2-2
- Fix ocaml library path

2
sources
View File

@ -1 +1 @@
SHA512 (merlin-3.2.2.tar.gz) = 671657df844d17ecaef04ec7802177ac2cc087fc421c4133412b6d9c83241513b75e2bab4468de36065bb131eb3db180a496476c333ace814005e86529167de4
SHA512 (merlin-3.3.1.tar.gz) = 8aa976197a55cdbe38180e80b1ae98b7408734a7a55b975a5be982016e7e723c64e9a82bcb1ff2827b27f9c5d210a2c34665d3e5c18afdaf4b0767b526b3d834