From 6a2c7e81b27cd16e31ddb79bdd407dce745f730f Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Jul 20 2022 22:51:57 +0000
Subject: Use new OCaml macros.


---

diff --git a/ocaml-markup.spec b/ocaml-markup.spec
index 755f5c9..05d6cdb 100644
--- a/ocaml-markup.spec
+++ b/ocaml-markup.spec
@@ -4,22 +4,19 @@
 %global debug_package %{nil}
 %endif
 
-%global srcname markup
-
-Name:           ocaml-%{srcname}
+Name:           ocaml-markup
 Version:        1.0.3
 Release:        2%{?dist}
 Summary:        Error-recovering streaming HTML5 and XML parsers for OCaml
 
 License:        MIT
 URL:            https://aantron.github.io/markup.ml/
-Source0:        https://github.com/aantron/markup.ml/archive/%{version}/%{srcname}-%{version}.tar.gz
+Source0:        https://github.com/aantron/markup.ml/archive/%{version}/markup-%{version}.tar.gz
 
 BuildRequires:  ocaml >= 4.03.0
 BuildRequires:  ocaml-bisect-ppx-devel >= 2.5.0
 BuildRequires:  ocaml-dune >= 2.7.0
 BuildRequires:  ocaml-lwt-devel
-BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-ounit-devel
 BuildRequires:  ocaml-uutf-devel >= 1.0.0
 
@@ -70,7 +67,7 @@ The %{name}-lwt-devel package contains libraries and signature files for
 developing applications that use %{name}-lwt.
 
 %prep
-%autosetup -n %{srcname}.ml-%{version} -p1
+%autosetup -n markup.ml-%{version} -p1
 
 # The uchar package is a forward compatibility package for OCaml versions prior
 # to 4.03.  We have a later OCaml in Fedora; uchar is in the standard library.
@@ -79,93 +76,28 @@ developing applications that use %{name}-lwt.
 sed -i '/uchar/d' markup.opam
 
 %build
-dune build %{?_smp_mflags} @install
-
-# Build the documentation.  Unfortunately, ocamldoc is not smart enough to
-# figure out that Kstream is Markup.Kstream.  I have not been able to figure
-# out how to convince it, so the temporary hacked-up copy of markup.mli is
-# my way of working around the problem.  We should really build documentation
-# with odoc, but this package is a build dependency of odoc.
-mkdir tmp
-sed '/Kstream/d' _build/default/src/markup.mli > tmp/markup.mli
-
-mkdir html
-ocamldoc -html -d html -css-style doc/style.css -I +lwt -I +lwt/unix \
-  -I _build/install/default/lib/markup \
-  -I _build/install/default/lib/markup-lwt \
-  -I _build/install/default/lib/markup-lwt/unix \
-  tmp/markup.mli \
-  _build/default/src/lwt/markup_lwt.mli \
-  _build/default/src/lwt_unix/markup_lwt_unix.mli
+%dune_build
 
 %install
-dune install --destdir=%{buildroot}
-
-# We install the documentation with the doc macro
-rm -fr %{buildroot}%{_prefix}/doc
+%dune_install -s
 
 %check
-dune runtest
+%dune_check
 
-%files
+%files -f .ofiles-markup
 %doc README.md
 %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
-%doc html/*
-%{_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 lwt
-%dir %{_libdir}/ocaml/%{srcname}-lwt/
-%dir %{_libdir}/ocaml/%{srcname}-lwt/unix/
-%{_libdir}/ocaml/%{srcname}-lwt/META
-%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cma
-%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmi
-%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cma
-%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmi
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmxs
-%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmxs
-%endif
+%files devel -f .ofiles-markup-devel
 
-%files lwt-devel
-%{_libdir}/ocaml/%{srcname}-lwt/dune-package
-%{_libdir}/ocaml/%{srcname}-lwt/opam
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.a
-%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmx
-%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmxa
-%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.a
-%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmx
-%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmxa
-%endif
-%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmt
-%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmti
-%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.ml
-%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.mli
-%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmt
-%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmti
-%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.ml
-%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.mli
+%files lwt -f .ofiles-markup-lwt
+
+%files lwt-devel -f .ofiles-markup-lwt-devel
 
 %changelog
+* Wed Jul 20 2022 Jerry James <loganjerry@gmail.com> - 1.0.3-2
+- Use new OCaml macros
+
 * Sun Jun 19 2022 Richard W.M. Jones <rjones@redhat.com> - 1.0.3-2
 - OCaml 4.14.0 rebuild