#1 R ocaml-biniou-devel and ocaml-easy-format-devel from the devel subpackage
Merged 2 years ago by jjames. Opened 2 years ago by jjames.
rpms/ jjames/ocaml-yojson rawhide  into  rawhide

file modified
+12 -6
@@ -6,7 +6,7 @@ 

  

  Name:           ocaml-%{libname}

  Version:        1.7.0

- Release:        18%{?dist}

+ Release:        19%{?dist}

  Summary:        An optimized parsing and printing library for the JSON format

  

  License:        BSD
@@ -20,6 +20,7 @@ 

  BuildRequires:  ocaml-cppo

  BuildRequires:  ocaml-easy-format-devel

  BuildRequires:  ocaml-dune

+ BuildRequires:  ocaml-alcotest-devel

  

  %description

  Yojson is an optimized parsing and printing library for the JSON
@@ -37,6 +38,8 @@ 

  %package        devel

  Summary:        Development files for %{name}

  Requires:       %{name}%{?_isa} = %{version}-%{release}

+ Requires:       ocaml-biniou-devel%{?_isa}

+ Requires:       ocaml-easy-format-devel%{?_isa}

  

  %description    devel

  The %{name}-devel package contains libraries and signature files for
@@ -48,7 +51,7 @@ 

  

  

  %build

- dune build

+ dune build %{?_smp_mflags} --verbose --profile release

  

  

  %install
@@ -63,10 +66,8 @@ 

  rm -f $RPM_BUILD_ROOT/%{_libdir}/ocaml/yojson/*.ml

  

  

- # Testing requires ocaml-alcotest, which we do not have in Fedora.

- # See https://github.com/mirage/alcotest.

- #%%check

- #dune runtest

+ %check

+ dune runtest --profile release

  

  

  %files
@@ -93,6 +94,11 @@ 

  

  

  %changelog

+ * Wed Dec 15 2021 Jerry James <loganjerry@gmail.com> - 1.7.0-19

+ - R ocaml-biniou-devel and ocaml-easy-format-devel from the devel subpackage

+ - Build in release mode

+ - Enable testing now that alcotest is available

+ 

  * Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.0-18

  - OCaml 4.13.1 build

  

  • Build in release mode
  • Enable testing now that alcotest is available

The reason for the additional requires in the devel subpackage is that the META file lists biniou and easy-format as requires. As a result, OCaml looks for easy_format.cmxa and biniou.cmxa when building any package that depends on yojson, even when that package does not depend directly on biniou or easy-format. This change ensures the necessary cmxa files are available.

I am merging this to unblock subsequent builds. Let me know if you want any changes after the fact.

Pull-Request has been merged by jjames

2 years ago
Metadata