From c3e2c99ca9aeb75fadd0fc462a09f70d373e7612 Mon Sep 17 00:00:00 2001
From: Andy Li <andy@onthewings.net>
Date: Fri, 18 May 2018 10:07:33 +0800
Subject: [PATCH] New upstream release (RHBZ#1579582).

---
 .gitignore           |  1 +
 ocaml-benchmark.spec | 38 ++++++++++++++++++++++----------------
 sources              |  2 +-
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index b734a5c..b61be66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ocaml-benchmark-1.4.tar.gz
+/ocaml-benchmark-1.5.tar.gz
diff --git a/ocaml-benchmark.spec b/ocaml-benchmark.spec
index 1d28cfc..1244f0b 100644
--- a/ocaml-benchmark.spec
+++ b/ocaml-benchmark.spec
@@ -1,8 +1,6 @@
-%global debug_package %{nil}
-
 Name:           ocaml-benchmark
-Version:        1.4
-Release:        3%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        Benchmarking module for OCaml
 
 License:        LGPLv3+ with exceptions
@@ -10,10 +8,9 @@ URL:            http://ocaml-benchmark.forge.ocamlcore.org/
 Source0:        https://github.com/Chris00/ocaml-benchmark/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  ocaml
-BuildRequires:  ocaml-oasis-devel
-BuildRequires:  ocaml-ocamlbuild
 BuildRequires:  ocaml-findlib
-BuildRequires:  ocaml-ocamldoc
+BuildRequires:  jbuilder
+BuildRequires:  opam-installer
 
 %description
 Benchmark provides functions to measure and compare the run-time of functions.
@@ -36,25 +33,29 @@ developing applications that use %{name}.
 
 
 %build
-make setup.ml
-ocaml setup.ml -configure --destdir $RPM_BUILD_ROOT --prefix %{_prefix}
-ocaml setup.ml -build
+jbuilder build @install
 
 
 %install
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR
-ocaml setup.ml -install
+jbuilder install --destdir="$DESTDIR" --libdir="$OCAMLFIND_DESTDIR" --verbose
+
+# These files will be installed using the doc and license directives
+rm $DESTDIR/doc/benchmark/{CHANGES.md,LICENSE.md,README.md}
+
+# Makes *.cmxs executable such that they will be stripped.
+find %{buildroot} -name '*.cmxs' -exec chmod 0755 {} \;
 
 
 %check
-ocaml setup.ml -test
+jbuilder runtest
 
 
 %files
-%doc README.md
-%license LICENSE.txt
+%doc README.md CHANGES.md
+%license LICENSE.md
 %{_libdir}/ocaml/benchmark
 %ifarch %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/benchmark/*.a
@@ -65,8 +66,8 @@ ocaml setup.ml -test
 
 
 %files devel
-%doc README.md
-%license LICENSE.txt
+%doc README.md CHANGES.md
+%license LICENSE.md
 %ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/benchmark/*.a
 %{_libdir}/ocaml/benchmark/*.cmxa
@@ -76,6 +77,11 @@ ocaml setup.ml -test
 
 
 %changelog
+* Fri May 18 2018 Andy Li <andy@onthewings.net> - 1.5-1
+- New upstream release (RHBZ#1579582).
+- Update build commands to use jbuilder.
+- Enable debug package.
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index a23683e..c2309a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ocaml-benchmark-1.4.tar.gz) = e6b7d64482ff3c9957c9711875d28374b4ab96ebfea078622f250ab8e17f39d20c60358456d7218571cdeaa9f53c3afbd5fee3bea7da2943bc0375be9296bdf6
+SHA512 (ocaml-benchmark-1.5.tar.gz) = 7df2e9b5301cbfb2df86db61c99a9d3ac253e41e68b7fe085cceeff06b7ce497167c6a80239665582a19eeec3f839243161f28e88c60288285b3f23c0b8133d0