From bb74523c140301ce149d91dbcec81dd4109027d3 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Jul 21 2022 02:09:27 +0000
Subject: Use new OCaml macros.


---

diff --git a/ocaml-parsexp.spec b/ocaml-parsexp.spec
index 3addcd5..1a27368 100644
--- a/ocaml-parsexp.spec
+++ b/ocaml-parsexp.spec
@@ -1,18 +1,17 @@
 %undefine _package_note_flags
+
 %ifnarch %{ocaml_native_compiler}
 %global debug_package %{nil}
 %endif
 
-%global srcname parsexp
-
-Name:           ocaml-%{srcname}
+Name:           ocaml-parsexp
 Version:        0.15.0
 Release:        5%{?dist}
 Summary:        S-expression parsing library
 
 License:        MIT
 URL:            https://github.com/janestreet/parsexp
-Source0:        %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz
+Source0:        %{url}/archive/v%{version}/parsexp-%{version}.tar.gz
 
 BuildRequires:  ocaml >= 4.08.0
 BuildRequires:  ocaml-base-devel >= 0.15
@@ -44,51 +43,34 @@ parsexp_io.
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       ocaml-base-devel%{?_isa}
+Requires:       ocaml-sexplib0-devel%{?_isa}
 
 %description    devel
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
 %prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -n parsexp-%{version}
 
 %build
-dune build %{?_smp_mflags} --verbose --release
+%dune_build
 
 %install
-dune install --destdir=%{buildroot}
-
-# We install the documentation with the doc macro
-rm -fr %{buildroot}%{_prefix}/doc
+%dune_install
 
 %check
-dune runtest --release
+%dune_check
 
-%files
+%files -f .ofiles
 %doc CHANGES.md README.org
 %license LICENSE.md
-%dir %{_libdir}/ocaml/%{srcname}/
-%{_libdir}/ocaml/%{srcname}/META
-%{_libdir}/ocaml/%{srcname}/%{srcname}*.cma
-%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmi
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmxs
-%endif
 
-%files devel
-%{_libdir}/ocaml/%{srcname}/dune-package
-%{_libdir}/ocaml/%{srcname}/opam
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{srcname}/%{srcname}*.a
-%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmx
-%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmxa
-%endif
-%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmt
-%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmti
-%{_libdir}/ocaml/%{srcname}/*.ml
-%{_libdir}/ocaml/%{srcname}/*.mli
+%files devel -f .ofiles-devel
 
 %changelog
+* Wed Jul 20 2022 Jerry James <loganjerry@gmail.com> - 0.15.0-5
+- Use new OCaml macros
+
 * Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 0.15.0-5
 - OCaml 4.14.0 rebuild