From a32b66ee520c3a729f6f1763ab98b2a68786fc93 Mon Sep 17 00:00:00 2001 From: Sergey Avseyev Date: May 09 2019 10:05:08 +0000 Subject: Update build scripts to use dune --- diff --git a/utop.spec b/utop.spec index bcf4d0c..95b7d9d 100644 --- a/utop.spec +++ b/utop.spec @@ -1,6 +1,6 @@ Name: utop Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Improved toplevel for OCaml License: BSD @@ -11,7 +11,7 @@ BuildRequires: ocaml BuildRequires: ocaml-findlib BuildRequires: ocaml-lambda-term BuildRequires: ocaml-cppo -BuildRequires: jbuilder +BuildRequires: ocaml-dune BuildRequires: opam-installer # for utop.el @@ -41,16 +41,21 @@ developing applications that use %{name}. %autosetup %build -jbuilder build -p %{name} %{?_smp_mflags} +dune build --verbose \ + --for-release-of-packages=%{name} \ + %{?_smp_mflags} %install -export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml -mkdir -p $OCAMLFIND_DESTDIR -jbuilder install --prefix %{buildroot}%{_prefix} +dune install --verbose \ + --for-release-of-packages=%{name} \ + --destdir=%{buildroot} \ + --libdir=%{_libdir}/ocaml + mkdir -p %{buildroot}%{_mandir}/man{1,5} -mv %{buildroot}%{_prefix}/man/*.1 %{buildroot}%{_mandir}/man1 -mv %{buildroot}%{_prefix}/man/*.5 %{buildroot}%{_mandir}/man5 -rm -rf %{buildroot}%{_prefix}/doc +mv %{buildroot}%{_prefix}/man/man1/*.1 %{buildroot}%{_mandir}/man1 +mv %{buildroot}%{_prefix}/man/man5/*.5 %{buildroot}%{_mandir}/man5 + +rm -f %{buildroot}/usr/doc/%{name}/{LICENSE,CHANGES.md,README.md} %files %license LICENSE @@ -64,11 +69,15 @@ rm -rf %{buildroot}%{_prefix}/doc %exclude %{_libdir}/ocaml/%{name}/*.mli %files devel +%license LICENSE %doc README.md CHANGES.md %{_libdir}/ocaml/%{name}/*.mli %changelog +* Thu May 09 2019 Sergey Avseyev - 2.3.0-2 +- Update build scripts + * Fri Feb 01 2019 Sergey Avseyev - 2.3.0-1 - Update to 2.3.0