From bf0ad1a30fb3d17425c5b0a15ea841ed0d6a2f00 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Jan 16 2020 19:37:27 +0000 Subject: Add ocaml-re-dvel and ocaml-uutf-devel Rs to -devel. Add ocaml-ppx-derivers-devel and ocaml-ppx-tools-versioned-devel Rs to -ppx-devel. Build in parallel. --- diff --git a/ocaml-tyxml.spec b/ocaml-tyxml.spec index 187d245..4f8ef36 100644 --- a/ocaml-tyxml.spec +++ b/ocaml-tyxml.spec @@ -6,7 +6,7 @@ Name: ocaml-%{srcname} Version: 4.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Build valid HTML and SVG documents License: LGPLv2 with exceptions @@ -23,11 +23,11 @@ BuildRequires: ocaml-migrate-parsetree-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ppx-derivers-devel BuildRequires: ocaml-ppx-tools-versioned-devel -BuildRequires: ocaml-re-devel +BuildRequires: ocaml-re-devel >= 1.5.0 BuildRequires: ocaml-result-devel BuildRequires: ocaml-seq-devel BuildRequires: ocaml-uuidm-devel -BuildRequires: ocaml-uutf-devel +BuildRequires: ocaml-uutf-devel >= 1.0.0 %description TyXML provides a set of convenient combinators that uses the OCaml type @@ -41,7 +41,9 @@ combinators. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: ocaml-re-devel%{?_isa} Requires: ocaml-seq-devel%{?_isa} +Requires: ocaml-uutf-devel%{?_isa} %description devel The %{name}-devel package contains libraries and signature files for @@ -73,6 +75,8 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} Requires: %{name}-ppx%{?_isa} = %{version}-%{release} Requires: ocaml-markup-devel%{?_isa} Requires: ocaml-migrate-parsetree-devel%{?_isa} +Requires: ocaml-ppx-derivers-devel%{?_isa} +Requires: ocaml-ppx-tools-versioned-devel%{?_isa} %description ppx-devel The %{name}-ppx-devel package contains libraries and signature files for @@ -89,7 +93,7 @@ sed -i 's/onmousdown/onmousedown/' lib/svg_f.ml sed -i 's/Re\.get/Re.Group.get/' ppx/tyxml_ppx.ml %build -dune build +dune build %{?_smp_mflags} # Build the documentation. mkdir html @@ -208,5 +212,11 @@ dune runtest %license LICENSE %changelog +* Thu Jan 16 2020 Jerry James - 4.3.0-2 +- Add ocaml-re-dvel and ocaml-uutf-devel Rs to -devel +- Add ocaml-ppx-derivers-devel and ocaml-ppx-tools-versioned-devel Rs to + -ppx-devel +- Build in parallel + * Fri Jan 10 2020 Jerry James - 4.3.0-1 - Initial RPM