From ae2f55a9131c46c26e4e09bb8438fca2afc2c334 Mon Sep 17 00:00:00 2001
From: Sergey Avseyev <sergey.avseyev@gmail.com>
Date: Thu, 9 May 2019 13:05:08 +0300
Subject: [PATCH] Update build scripts to use dune

---
 utop.spec | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/utop.spec b/utop.spec
index 7393519..a4f5a92 100644
--- a/utop.spec
+++ b/utop.spec
@@ -1,17 +1,17 @@
 Name:           utop
 Version:        2.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Improved toplevel for OCaml
 
 License:        BSD
-URL:            https://github.com/diml/utop
-Source0:        https://github.com/diml/%{name}/releases/download/%{version}/%{name}-%{version}.tbz
+URL:            https://github.com/ocaml-community/utop
+Source0:        https://github.com/ocaml-community/%{name}/releases/download/%{version}/%{name}-%{version}.tbz
 
 BuildRequires:  ocaml
 BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-lambda-term
 BuildRequires:  ocaml-cppo
-BuildRequires:  jbuilder
+BuildRequires:  ocaml-dune
 BuildRequires:  opam-installer
 
 # for utop.el
@@ -41,14 +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}
-mv %{buildroot}%{_prefix}/man %{buildroot}%{_mandir}
-rm -rf %{buildroot}%{_prefix}/doc
+dune install --verbose \
+    --for-release-of-packages=%{name} \
+    --destdir=%{buildroot} \
+    --libdir=%{_libdir}/ocaml
+
+mkdir -p %{buildroot}%{_mandir}/man{1,5}
+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
@@ -62,10 +69,14 @@ 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 <sergey.avseyev@gmail.com> - 2.1.0-2
+- Update build scripts
+
 * Mon Mar 05 2018 Sergey Avseyev <sergey.avseyev@gmail.com> 2.1.0-1
 - Initial packaging.