OCaml 4.12.0 build

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,2 +1,3 @@
 /ocaml-base64-2.0.0.tar.gz
 /v2.1.2.tar.gz
+/base64-v3.4.0.tbz

ocaml-base64.spec

@@ -1,21 +1,19 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%if ! %opt
+%ifnarch %{ocaml_native_compiler}
 %global debug_package %{nil}
 %endif
 
 Name:           ocaml-base64
-Version:        2.1.2
-Release:        13%{?dist}
+Version:        3.4.0
+Release:        4%{?dist}
 Summary:        Base64 library for OCaml
 
 License:        ISC
 URL:            https://github.com/mirage/ocaml-base64
-Source0:        https://github.com/mirage/ocaml-base64/archive/v%{version}.tar.gz
+Source0:        https://github.com/mirage/ocaml-base64/releases/download/v%{version}/base64-v%{version}.tbz
 
 BuildRequires:  ocaml
-BuildRequires:  ocaml-ocamlbuild
 BuildRequires:  ocaml-ocamldoc
-BuildRequires:  ocaml-findlib
+BuildRequires:  ocaml-dune-devel
 
 
 %description
@@ -34,33 +32,35 @@ Development files for %{name}.
 
 
 %prep
-%setup -q
+%setup -q -n base64-v%{version}
 
 
 %build
-# Bizarro build system, so build and install it by hand.
-ocamlbuild -use-ocamlfind -classic-display -tag debug src/b64.cma
-ocamlbuild -use-ocamlfind -classic-display -tag debug src/b64.cmxa
-ocamlbuild -use-ocamlfind -classic-display -tag debug src/b64.cmxs
+# Only build the source directory since the other directories
+# require packages that we don't have or need.
+rm -r fuzz test
+dune build %{?_smp_mflags}
 
 
 %install
-export DESTDIR=$RPM_BUILD_ROOT
-export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
-mkdir -p $OCAMLFIND_DESTDIR
-sed 's/^version.*/version = "%{version}"/' < pkg/META > META
-ocamlfind install base64 _build/src/* META
+dune install --destdir=%{buildroot}
 
-# Delete a few files we don't really want.
-pushd $OCAMLFIND_DESTDIR/base64
-rm b64.annot b64.cmt b64.cmti
-popd
+# We do not want the ml files
+find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete
+
+# We install the documentation with the doc macro
+rm -fr %{buildroot}%{_prefix}/doc
+
+%ifarch %{ocaml_native_compiler}
+# Add missing executable bits
+find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+
+%endif
 
 
 %files
 %doc README.md
 %{_libdir}/ocaml/base64
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/base64/*.a
 %exclude %{_libdir}/ocaml/base64/*.cmx
 %exclude %{_libdir}/ocaml/base64/*.cmxa
@@ -71,7 +71,7 @@ popd
 
 %files devel
 %doc CHANGES.md
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/base64/*.a
 %{_libdir}/ocaml/base64/*.cmx
 %{_libdir}/ocaml/base64/*.cmxa
@@ -81,6 +81,73 @@ popd
 
 
 %changelog
+* Mon Mar  1 16:57:53 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 3.4.0-4
+- OCaml 4.12.0 build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 22 2021 Jerry James <loganjerry@gmail.com> -3.4.0-2
+- Produce usable debuginfo
+
+* Thu Jan 21 2021 Richard W.M. Jones <rjones@redhat.com> - 3.4.0-1
+- New upstream version 3.4.0.
+- Use dune to build.
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-31
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-30
+- OCaml 4.11.0 rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-28
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-27
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-26
+- OCaml 4.11.0 pre-release
+
+* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-25
+- Update all OCaml dependencies for RPM 4.16.
+
+* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-24
+- OCaml 4.10.0 final.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-22
+- OCaml 4.10.0+beta1 rebuild.
+
+* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-21
+- OCaml 4.09.0 for riscv64
+
+* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-20
+- OCaml 4.09.0 (final) rebuild.
+
+* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-19
+- OCaml 4.08.1 (final) rebuild.
+
+* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-18
+- OCaml 4.08.1 (rc2) rebuild.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-16
+- OCaml 4.08.0 (final) rebuild.
+
+* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 2.1.2-15
+- OCaml 4.08.0 (beta 3) rebuild.
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

sources

@@ -1 +1 @@
-479d28f71f28df483bf34d3a2cffaf04  v2.1.2.tar.gz
+SHA512 (base64-v3.4.0.tbz) = e66a67302a9eb136044bebf66a89a1d6e38a96c70622bb6cd27916fec36dcaf4b5b7e7d00c25608f0a2363f2ca4264a5fe765fe7747590958325dbce06311db9