diff --git a/.gitignore b/.gitignore index df9d038..3a96e38 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /merlin-3.3.1.tar.gz /merlin-3.3.2.tar.gz /merlin-3.3.3.tar.gz +/merlin-v3.3.4-preview1.tbz diff --git a/ocaml-merlin.spec b/ocaml-merlin.spec index 0aa870a..b050e95 100644 --- a/ocaml-merlin.spec +++ b/ocaml-merlin.spec @@ -1,14 +1,15 @@ Name: ocaml-merlin -Version: 3.3.3 -Release: 2%{?dist} +Version: 3.3.4 +Release: 0.1.preview1%{?dist} Summary: Context sensitive completion for OCaml in Vim and Emacs %global libname %(echo %{name} | sed -e 's/^ocaml-//') +%global tag v%{version}-preview1 # 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 +Source0: https://github.com/ocaml/%{libname}/releases/download/%{tag}/%{libname}-%{tag}.tbz BuildRequires: ocaml BuildRequires: ocaml-dune >= 1.8 @@ -48,7 +49,7 @@ much more. %prep -%setup -q -n %{libname}-%{version} +%setup -q -n %{libname}-%{tag} %build @@ -82,6 +83,9 @@ rm -fr %{buildroot}%{_prefix}/doc %{vimfiles_root}/*/* %changelog +* Tue Mar 3 2020 Robin Lee - 3.3.4-0.1.preview1 +- Update to 3.3.4-preview1, supports OCaml 4.10 (BZ#1799817, BZ#1809312) + * Wed Jan 29 2020 Fedora Release Engineering - 3.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 3e03c50..7ec164a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (merlin-3.3.3.tar.gz) = b8b6a48d006d260be1b3a22b15b97520d05aae8d751dc9c7708b2992d94aa027ac456de1b97f6e70ac331906225b043d3a1858c1850ee0b4abeb093e7f72306b +SHA512 (merlin-v3.3.4-preview1.tbz) = 87819eb37047aa826c290d9fa82906e90178959f27448941161969f1c931d7b40f9959934a87a4132f8c46b476126f564d304a174a6131e9f837d258abdabbc3