OCaml 4.12.0 build

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

.gitignore

@@ -1 +1,3 @@
-/biniou-1.0.9.tar.gz
+/biniou-*.tar.gz
+/ocaml-biniou-*.tar.gz
+/biniou-*.tbz

ocaml-biniou.spec

@@ -1,23 +1,24 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%if !%{opt}
+%ifnarch %{ocaml_native_compiler}
 %global debug_package %{nil}
 %endif
 
-Name:           ocaml-biniou
-Version:        1.0.9
-Release:        11%{?dist}
+%global libname biniou
+
+Name:           ocaml-%{libname}
+Version:        1.2.1
+Release:        14%{?dist}
 Summary:        Safe and fast binary data format
 
 License:        BSD
-URL:            http://mjambon.com/biniou.html
-Source0:        http://mjambon.com/releases/biniou/biniou-%{version}.tar.gz
+URL:            https://github.com/ocaml-community/%{libname}
+Source0:        %{url}/releases/download/%{version}/%{libname}-%{version}.tbz
 
+BuildRequires: make
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-easy-format-devel
 BuildRequires:  ocaml-ocamldoc
-
-%global libname %(sed -e 's/^ocaml-//' <<< %{name})
+BuildRequires:  ocaml-dune
 
 %description
 Biniou (pronounced "be new") is a binary data format designed for
@@ -43,66 +44,190 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n %{libname}-%{version}
-sed -i.add-debuginfo \
-    's/ocamlopt/ocamlopt -g/;s/ocamlc \(-[co]\)/ocamlc -g \1/' \
-    Makefile
 
 
 %build
-# not thread safe - intermittent build failures as per 1.0.2
-# see http://www.cmake.org/pipermail/cmake/2010-January/034746.html
-# for similar problem
-%global _smp_mflags %{nil}
 make %{?_smp_mflags} all
-%if %opt
-make %{?_smp_mflags} opt
-%endif
-make %{?_smp_mflags} META
 
 
 %install
-# These rules work if the library uses 'ocamlfind install' to install itself.
-export PREFIX=$RPM_BUILD_ROOT%{_prefix}
-export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $OCAMLFIND_DESTDIR
-make install #DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml
 
-%if %opt
+cp -L _build/install/default/bin/* $RPM_BUILD_ROOT%{_bindir}
+cp -rL _build/install/default/lib/* $RPM_BUILD_ROOT%{_libdir}/ocaml
+
+%ifarch %{ocaml_native_compiler}
 # avoid potential future name conflict
 mv $RPM_BUILD_ROOT%{_bindir}/{,ocaml-}bdump
 %endif
 
 
 %check
+# The upstream Makefile doesn't know how to build the tests
+# without ocamlopt, so:
+%ifarch %{ocaml_native_compiler}
 make test
+%endif
 
 
 %files
-%doc LICENSE
+%license LICENSE
+%doc README.md
 %{_libdir}/ocaml/%{libname}/
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/*/*.a
 %exclude %{_libdir}/ocaml/*/*.cmxa
 %exclude %{_libdir}/ocaml/*/*.cmx
-%exclude %{_libdir}/ocaml/*/*.o
 %endif
 %exclude %{_libdir}/ocaml/*/*.mli
 
 
 %files devel
-%doc LICENSE README.md Changes
-%if %opt
+%license LICENSE
+%doc biniou-format.txt CHANGES.md
+%doc _build/install/default/doc/*
+%ifarch %{ocaml_native_compiler}
 %{_bindir}/ocaml-bdump
 %{_libdir}/ocaml/*/*.a
 %{_libdir}/ocaml/*/*.cmxa
 %{_libdir}/ocaml/*/*.cmx
-%{_libdir}/ocaml/*/*.o
 %endif
 %{_libdir}/ocaml/*/*.mli
 
 
 %changelog
+* Mon Mar  1 16:58:01 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-14
+- OCaml 4.12.0 build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-12
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-11
+- OCaml 4.11.0 rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-10
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-8
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-7
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-6
+- Update all OCaml dependencies for RPM 4.16.
+
+* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-5
+- OCaml 4.10.0 final.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-3
+- OCaml 4.10.0+beta1 rebuild.
+
+* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-2
+- OCaml 4.09.0 (final) rebuild.
+
+* Thu Sep  5 2019 Jerry James <loganjerry@gmail.com> - 1.2.1-1
+- New upstream version 1.2.1.
+- New URLs.
+
+* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-12
+- OCaml 4.08.1 (final) rebuild.
+
+* Thu Aug  1 2019 Jerry James <loganjerry@gmail.com> - 1.2.0-11
+- Rebuild for ocaml-easy-format 1.3.1
+
+* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-10
+- OCaml 4.08.1 (rc2) rebuild.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-8
+- OCaml 4.08.0 (final) rebuild.
+
+* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-7
+- OCaml 4.08.0 (beta 3) rebuild.
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-4
+- OCaml 4.07.0 (final) rebuild.
+
+* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-3
+- OCaml 4.07.0-rc1 rebuild.
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Nov 17 2017 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-1
+- New upstream version 1.2.0.
+- OCaml 4.06.0 rebuild.
+- Fix URL and source.
+- Stop using opt macro.
+- Enable debuginfo everywhere.
+- Try using parallel builds.
+
+* Tue Aug 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-26
+- OCaml 4.05.0 rebuild.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-23
+- OCaml 4.04.2 rebuild.
+
+* Fri May 12 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-22
+- OCaml 4.04.1 rebuild.
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 1.0.9-20
+- rebuild for s390x codegen bug
+
+* Mon Nov 07 2016 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-19
+- Rebuild for OCaml 4.04.0.
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-17
+- OCaml 4.02.3 rebuild.
+
+* Tue Jul 21 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-16
+- Enable bytecode compilation.
+
+* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-15
+- Bump release and rebuild.
+
+* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-14
+- ocaml-4.02.2 final rebuild.
+
+* Wed Jun 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-13
+- ocaml-4.02.2 rebuild.
+
+* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-12
+- ocaml-4.02.1 rebuild.
+
 * Sun Aug 31 2014 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-11
 - Bump release and rebuild.
 

sources

@@ -1 +1 @@
-2f9f355281817912ac04c589eb463ef2  biniou-1.0.9.tar.gz
+SHA512 (biniou-1.2.1.tbz) = 82670cc77bf3e869ee26e5fbe5a5affa45a22bc8b6c4bd7e85473912780e0111baca59b34a2c14feae3543ce6e239d7fddaeab24b686a65bfe642cdb91d27ebf