diff --git a/.gitignore b/.gitignore index 077e62c..ac0ce01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/zed-1.5.tar.gz -/zed-1.6.tar.gz -/zed-2.0.2.tar.gz -/zed-2.0.3.tar.gz +/zed-*.tar.gz diff --git a/ocaml-zed.spec b/ocaml-zed.spec index 27e0b69..e795043 100644 --- a/ocaml-zed.spec +++ b/ocaml-zed.spec @@ -1,16 +1,15 @@ Name: ocaml-zed -Version: 2.0.3 -Release: 11%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: Abstract engine for text edition in OCaml %global libname %(echo %{name} | sed -e 's/^ocaml-//') License: BSD -URL: https://github.com/diml/zed -Source0: https://github.com/diml/zed/archive/%{version}/%{libname}-%{version}.tar.gz +URL: https://github.com/ocaml-community/zed +Source0: https://github.com/ocaml-community/zed/archive/%{version}/%{libname}-%{version}.tar.gz BuildRequires: ocaml -BuildRequires: ocaml-findlib BuildRequires: ocaml-camomile-devel BuildRequires: ocaml-react-devel BuildRequires: ocaml-charinfo-width-devel @@ -30,6 +29,9 @@ manipulation functions. %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} +Requires: ocaml-camomile-devel%{_isa} +Requires: ocaml-react-devel%{_isa} +Requires: ocaml-charinfo-width-devel%{_isa} %description devel The %{name}-devel package contains libraries and signature files for @@ -43,8 +45,18 @@ developing applications that use %{name}. dune build -p %{libname} %{?_smp_mflags} %install -mkdir -p %{buildroot}%{_libdir}/ocaml/zed/ -cp -aLr _build/install/default/lib/zed/* %{buildroot}%{_libdir}/ocaml/zed/ +dune install --destdir=%{buildroot} + +# We install the documentation with the doc macro +rm -fr %{buildroot}%{_prefix}/doc + +# We do not want the ml files +find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete + +%ifarch %{ocaml_native_compiler} +# Add missing executable bits +find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+ +%endif %files %license LICENSE @@ -69,6 +81,9 @@ cp -aLr _build/install/default/lib/zed/* %{buildroot}%{_libdir}/ocaml/zed/ %changelog +* Tue Aug 4 2020 Jerry James - 3.1.0-1 +- Version 3.1.0 + * Sat Aug 01 2020 Fedora Release Engineering - 2.0.3-11 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 74371ee..9c2e0d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zed-2.0.3.tar.gz) = b1c790d2a0d0b6fe8d43a718716910ebb38c16a8adad553f08120dfb653da971312ce760d68efb458b662bc8c39c60c46b9c3e951f61535f7972b444f4eabdbc +SHA512 (zed-3.1.0.tar.gz) = d4457af15f970adb7b1ed543017e590fa0ecc47171d6dd520a1397f21ce0219caa30a9db7bedb76c0602d4f6d0f0684012cc33feafe18b848d3261a460dea10a