OCaml 4.12.0 build

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

.cvsignore

@@ -1 +0,0 @@
-release-1.2.21.tar.bz2

.gitignore

@@ -0,0 +1,3 @@
+/release-*.tar.bz2
+/bin-prot-*.tar.gz
+/bin_prot-*.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ocaml-bin-prot
-# $Id$
-NAME := ocaml-bin-prot
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

import.log

@@ -1 +0,0 @@
-ocaml-bin-prot-1_2_20-2_fc11:HEAD:ocaml-bin-prot-1.2.20-2.fc11.src.rpm:1263211413

ocaml-bin-prot.spec

@@ -1,26 +1,27 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%global debug_package %{nil}
+%global srcname bin-prot
+%global upname  bin_prot
 
-Name:           ocaml-bin-prot
-Version:        1.2.21
-Release:        1%{?dist}
+Name:           ocaml-%{srcname}
+Version:        0.14.0
+Epoch:          1
+Release:        7%{?dist}
 Summary:        Read and write OCaml values in a type-safe binary protocol
 
-Group:          Development/Libraries
-License:        LGPLv2+ with exceptions
-URL:            http://ocaml.janestcapital.com/?q=node/13
-Source0:        http://hg.ocaml.info/release/bin-prot/archive/release-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  ocaml >= 3.10.0
-BuildRequires:  ocaml-findlib-devel
-BuildRequires:  ocaml-ocamldoc
-BuildRequires:  ocaml-camlp4-devel
-BuildRequires:  ocaml-ounit-devel
-BuildRequires:  ocaml-type-conv >= 1.5.0
-BuildRequires:  chrpath
-BuildRequires:  dos2unix
+# 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
 
+BuildRequires:  ocaml >= 4.04.2
+BuildRequires:  ocaml-base-devel >= 0.14
+BuildRequires:  ocaml-dune >= 2.0.0
+BuildRequires:  ocaml-odoc
+BuildRequires:  ocaml-ppx-compare-devel >= 0.14
+BuildRequires:  ocaml-ppx-custom-printf-devel >= 0.14
+BuildRequires:  ocaml-ppx-fields-conv-devel >= 0.14
+BuildRequires:  ocaml-ppx-optcomp-devel >= 0.14
+BuildRequires:  ocaml-ppx-sexp-conv-devel >= 0.14
+BuildRequires:  ocaml-ppx-variants-conv-devel >= 0.14
 
 %description
 This library contains functionality for reading and writing OCaml
@@ -35,85 +36,252 @@ values will lead to non-termination whereas shared values, besides
 requiring significantly more space when encoded, may lead to a
 substantial increase in memory footprint when they are read back in.
 
-
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
+Requires:       %{name} = 1:%{version}-%{release}
+Requires:       ocaml-base-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}
 
 %description    devel
-The %{name}-devel package contains libraries and signature files for
-developing applications that use %{name}.
-
+The %{name}-devel package contains libraries and signature files
+for developing applications that use %{name}.
 
 %prep
-%setup -q -n bin-prot-release-%{version}
-dos2unix LICENSE.Tywith
-
+%autosetup -n %{upname}-%{version}
 
 %build
-make
-
-cat > README.Fedora <<EOT
-This package is available for non-x86 architectures in Fedora, but
-there may be shortcomings.  In particular, you will not be able to
-interchange data between little-endian and big-endian machines.
-For more details see:
-http://caml.inria.fr/pub/ml-archives/caml-list/2008/05/56cf55b101f21b608feb64c75b92c679.en.html
-- RWMJ 2008/05/05
-EOT
-
-
-%check
-# I couldn't find a 'make test' rule, but this works as well:
-./lib_test/test_runner
-./lib_test/mac_test
+dune build %{?_smp_mflags}
 
+# Relink with RPM_LD_FLAGS.
+pushd _build/default/src
+ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -o bin_prot_stubs blit_stubs.o
+popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
-export DESTDIR=$RPM_BUILD_ROOT
-export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
-mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
-make install
+dune install --destdir=%{buildroot}
 
-strip $OCAMLFIND_DESTDIR/stublibs/dll*.so
-chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+# 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 0755 {} \+
+%endif
 
 %files
-%defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE LICENSE.Tywith
-%{_libdir}/ocaml/bin_prot
-%if %opt
-%exclude %{_libdir}/ocaml/bin_prot/*.a
-%exclude %{_libdir}/ocaml/bin_prot/*.cmxa
+%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
-%exclude %{_libdir}/ocaml/bin_prot/*.mli
-%exclude %{_libdir}/ocaml/bin_prot/*.ml
-%{_libdir}/ocaml/stublibs/*.so
-%{_libdir}/ocaml/stublibs/*.so.owner
-
+%{_libdir}/ocaml/stublibs/dllbin_prot_stubs.so
 
 %files devel
-%defattr(-,root,root,-)
-%doc Changelog README.txt README.Fedora
-%if %opt
-%{_libdir}/ocaml/bin_prot/*.a
-%{_libdir}/ocaml/bin_prot/*.cmxa
+%{_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/bin_prot/*.mli
-# This is fine because there is no corresponding .mli file for
-# the .ml file which is included.
-%{_libdir}/ocaml/bin_prot/*.ml
-
+%{_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
 
 %changelog
+* Tue Mar  2 10:50:30 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1:0.14.0-7
+- OCaml 4.12.0 build
+
+* Sat Feb 20 2021 Jerry James <loganjerry@gmail.com> - 1:0.14.0-6
+- Rebuild for ocaml-base 0.14.1
+
+* Tue Feb  2 2021 Richard W.M. Jones <rjones@redhat.com> - 1:0.14.0-5
+- Bump and rebuild for updated ocaml Dynlink dependency.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.14.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Sep 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1:0.14.0-3
+- OCaml 4.11.1 rebuild
+
+* Mon Aug 24 2020 Richard W.M. Jones <rjones@redhat.com> - 1:0.14.0-2
+- OCaml 4.11.0 rebuild
+
+* Wed Aug 19 2020 Jerry James <loganjerry@gmail.com> - 1:0.14.0-1
+- Version 0.14.0
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.13.0-5
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.13.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 23 2020 Richard W.M. Jones <rjones@redhat.com> - 1:0.13.0-3
+- Rebuild to resolve build order symbol problems.
+
+* Wed Jun 24 2020 Jerry James <loganjerry@gmail.com> - 1:0.13.0-2
+- Fix the -devel subpackage dependency on the main package
+
+* Mon Jun 15 2020 Jerry James <loganjerry@gmail.com> - 1:0.13.0-1
+- Version 0.13.0
+- Add Epoch to deal with new version numbering scheme
+- License change to MIT and BSD
+- Build with dune
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-32
+- OCaml 4.07.0 (final) rebuild.
+
+* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-31
+- OCaml 4.07.0-rc1 rebuild.
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Nov 17 2017 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-29
+- OCaml 4.06.0 rebuild.
+
+* Tue Aug 08 2017 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-28
+- OCaml 4.05.0 rebuild.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-25
+- OCaml 4.04.2 rebuild.
+
+* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-24
+- OCaml 4.04.1 rebuild.
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Nov 08 2016 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-22
+- Rebuild for OCaml 4.04.0.
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-20
+- OCaml 4.02.3 rebuild.
+
+* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-19
+- ocaml-4.02.2 final rebuild.
+
+* Thu Jun 18 2015 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-18
+- ocaml-4.02.2 rebuild.
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.9-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-16
+- ocaml-4.02.1 rebuild.
+
+* Thu Sep 25 2014 Jerry James <loganjerry@gmail.com> - 2.0.9-15
+- Add -fix-ints patch for ocaml 4.02
+- Use native, rather than emulated endian-specific, 64-bit arithmetic
+- Fix license handling
+
+* Sun Aug 31 2014 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-14
+- Bump release and rebuild.
+
+* Sun Aug 31 2014 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-13
+- ocaml-4.02.0 final rebuild.
+
+* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-12
+- ocaml-4.02.0+rc1 rebuild.
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.9-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Aug 02 2014 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-10
+- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
+
+* Sat Jul 19 2014 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-9
+- OCaml 4.02.0 beta rebuild.
+
+* Wed Jun 18 2014 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-8
+- Remove -Werror from compiler flags.  Fixes FTBFS (RHBZ#1106613).
+- Move configure into build section (instead of prep).
+- Use global instead of define.
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.9-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-6
+- Rebuild for OCaml 4.01.0.
+- Enable debuginfo.
+- Modernize spec file.
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Oct 30 2012 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-3
+- Rebuild for OCaml 4.00.1.
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jul  2 2012 Richard W.M. Jones <rjones@redhat.com> - 2.0.9-1
+- New upstream version 2.0.9.
+- Recompile for OCaml 4.00.0.
+
+* Thu Jan 12 2012 Richard W.M. Jones <rjones@redhat.com> - 2.0.7-1
+- New upstream version 2.0.7.
+- Rebuild for OCaml 3.12.1.
+
+* Wed Sep 28 2011 Michael Ekstrand <michael@elehack.net> - 2.0.6-1
+- New upstream version from forge.ocamlcore.org (#741484)
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Jan  6 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.24-1
+- New upstream version 1.2.24.
+- Fix upstream URL.
+- Rebuild for OCaml 3.12.0.
+
 * Mon Jan 11 2010 Richard W.M. Jones <rjones@redhat.com> - 1.2.21-1
 - New upstream version 1.2.21.
 - Change %%define to %%global.

sources

@@ -1 +1 @@
-5a422e48c205d491611a3c81c28ba894  release-1.2.21.tar.bz2
+SHA512 (bin_prot-0.14.0.tar.gz) = 7e7bec7dc5ec49b7bc099687a90840620529c36d552e8985b45f2f9a2437396c8b41583081b8c6a75bf3b14bb3ab4db9134cebd12f70f2345c8fa74e1b8fa252