From 50c26280df8c246007c997c53928aa544baf00b9 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Jul 20 2022 19:49:16 +0000
Subject: Use new OCaml macros.


---

diff --git a/ocaml-bin-prot.spec b/ocaml-bin-prot.spec
index ac22ba8..0f207cc 100644
--- a/ocaml-bin-prot.spec
+++ b/ocaml-bin-prot.spec
@@ -1,8 +1,6 @@
 %undefine _package_note_flags
-%global srcname bin-prot
-%global upname  bin_prot
 
-Name:           ocaml-%{srcname}
+Name:           ocaml-bin-prot
 Version:        0.15.0
 Epoch:          1
 Release:        5%{?dist}
@@ -10,13 +8,12 @@ Summary:        Read and write OCaml values in a type-safe binary protocol
 
 # The project as a whole is MIT, but code in the src subdirectory is BSD.
 License:        MIT and BSD
-URL:            https://github.com/janestreet/%{upname}
-Source0:        %{url}/archive/v%{version}/%{upname}-%{version}.tar.gz
+URL:            https://github.com/janestreet/bin_prot
+Source0:        %{url}/archive/v%{version}/bin_prot-%{version}.tar.gz
 
 BuildRequires:  ocaml >= 4.08.0
 BuildRequires:  ocaml-base-devel >= 0.15
 BuildRequires:  ocaml-dune >= 2.0.0
-BuildRequires:  ocaml-odoc
 BuildRequires:  ocaml-ppx-compare-devel >= 0.15
 BuildRequires:  ocaml-ppx-custom-printf-devel >= 0.15
 BuildRequires:  ocaml-ppx-fields-conv-devel >= 0.15
@@ -41,77 +38,42 @@ substantial increase in memory footprint when they are read back in.
 Summary:        Development files for %{name}
 Requires:       %{name} = 1:%{version}-%{release}
 Requires:       ocaml-base-devel%{?_isa}
+Requires:       ocaml-fieldslib-devel%{?_isa}
 Requires:       ocaml-ppx-compare-devel%{?_isa}
-Requires:       ocaml-ppx-custom-printf-devel%{?_isa}
-Requires:       ocaml-ppx-fields-conv-devel%{?_isa}
-Requires:       ocaml-ppx-optcomp-devel%{?_isa}
 Requires:       ocaml-ppx-sexp-conv-devel%{?_isa}
-Requires:       ocaml-ppx-variants-conv-devel%{?_isa}
+Requires:       ocaml-sexplib0-devel%{?_isa}
+Requires:       ocaml-variantslib-devel%{?_isa}
 
 %description    devel
 The %{name}-devel package contains libraries and signature files
 for developing applications that use %{name}.
 
 %prep
-%autosetup -n %{upname}-%{version}
+%autosetup -n bin_prot-%{version}
 
 %build
-dune build %{?_smp_mflags} --verbose --release
-dune build %{?_smp_mflags} @doc
+%dune_build
 
 # Relink with Fedora linker flags
 cd _build/default/src
 ocamlmklib -g -ldopt "%{build_ldflags}" -o bin_prot_stubs blit_stubs.o
-cd -
 
 %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.md
 %license COPYRIGHT.txt LICENSE.md LICENSE-Tywith.txt THIRD-PARTY.txt
-%dir %{_libdir}/ocaml/%{upname}/
-%dir %{_libdir}/ocaml/%{upname}/shape/
-%dir %{_libdir}/ocaml/%{upname}/xen/
-%{_libdir}/ocaml/%{upname}/META
-%{_libdir}/ocaml/%{upname}/runtime.js
-%{_libdir}/ocaml/%{upname}/*.cma
-%{_libdir}/ocaml/%{upname}/*.cmi
-%{_libdir}/ocaml/%{upname}/*/*.cma
-%{_libdir}/ocaml/%{upname}/*/*.cmi
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{upname}/%{upname}*.cmxs
-%{_libdir}/ocaml/%{upname}/*/*.cmxs
-%endif
-%{_libdir}/ocaml/stublibs/dllbin_prot_stubs.so
-
-%files devel
-%{_libdir}/ocaml/%{upname}/dune-package
-%{_libdir}/ocaml/%{upname}/opam
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{upname}/*.a
-%{_libdir}/ocaml/%{upname}/*.cmx
-%{_libdir}/ocaml/%{upname}/*.cmxa
-%{_libdir}/ocaml/%{upname}/*/*.a
-%{_libdir}/ocaml/%{upname}/*/*.cmx
-%{_libdir}/ocaml/%{upname}/*/*.cmxa
-%endif
-%{_libdir}/ocaml/%{upname}/*.cmt
-%{_libdir}/ocaml/%{upname}/*.cmti
-%{_libdir}/ocaml/%{upname}/*.ml
-%{_libdir}/ocaml/%{upname}/*.mli
-%{_libdir}/ocaml/%{upname}/*/*.cmt
-%{_libdir}/ocaml/%{upname}/*/*.cmti
-%{_libdir}/ocaml/%{upname}/*/*.ml
-%{_libdir}/ocaml/%{upname}/*/*.mli
+
+%files devel -f .ofiles-devel
 
 %changelog
+* Wed Jul 20 2022 Jerry James <loganjerry@gmail.com> - 1:0.15.0-5
+- Use new OCaml macros
+
 * Sun Jun 19 2022 Richard W.M. Jones <rjones@redhat.com> - 1:0.15.0-5
 - OCaml 4.14.0 rebuild