diff --git a/ocaml-dune.rpmlintrc b/ocaml-dune.rpmlintrc deleted file mode 100644 index e72af52..0000000 --- a/ocaml-dune.rpmlintrc +++ /dev/null @@ -1,14 +0,0 @@ -# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON -# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors - -# The dictionary lacks some technical words -addFilter(r'W: spelling-error .* (composable|flymake)') - -# Caused by ocaml; this package cannot fix it -addFilter(r'ocaml-dune\.[^:]+: E: missing-call-to-chdir-with-chroot') - -# Documentation is in the main package -addFilter(r'ocaml-dune-.*\.[^:]+: W: no-documentation') - -# The configure script is not an autotools-generated script -addFilter(r'ocaml-dune\.spec:[^:]*: W: configure-without-libdir-spec') diff --git a/ocaml-dune.spec b/ocaml-dune.spec index e758eb6..e0ff505 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.9.1 -Release: 5%{?dist} +Version: 2.9.3 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -17,6 +17,8 @@ Summary: A composable build system for OCaml # LGPLv2 with exceptions: # - vendor/opam-file-format # - vendor/re +# MIT: +# - vendor/build_path_prefix_map License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC URL: https://dune.build @@ -26,7 +28,6 @@ BuildRequires: emacs BuildRequires: make BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-csexp-devel >= 1.3.0 -BuildRequires: ocaml-findlib BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-rtd-theme} @@ -40,15 +41,16 @@ BuildRequires: ocaml-menhir # It seems to be unsupported upstream; the bootstrap process for dune # doesn't seem to be able to detect libraries installed systemwide. # https://github.com/ocaml/dune/issues/220 -Provides: bundled(ocaml-build-path-prefix-map) = 0.2 -Provides: bundled(ocaml-opam-file-format) = 2.0.0 -Provides: bundled(ocaml-cmdliner) = 1.0.4 -Provides: bundled(ocaml-re) = 1.9.0 +Provides: bundled(ocaml-build-path-prefix-map) = 0.2 +Provides: bundled(ocaml-incremental-cycles) = 1e2030a5d5183d84561cde142eecca40e03db2a3 +Provides: bundled(ocaml-opam-file-format) = 2.0.0 +Provides: bundled(ocaml-cmdliner) = 1.0.4 +Provides: bundled(ocaml-re) = 1.9.0 -Provides: dune = %{version}-%{release} +Provides: dune = %{version}-%{release} -Provides: jbuilder = %{version}-%{release} -Obsoletes: jbuilder < 1.0.1-3 +Provides: jbuilder = %{version}-%{release} +Obsoletes: jbuilder < 1.0.1-3 %description Dune is a build system designed for OCaml/Reason projects only. It focuses @@ -209,6 +211,10 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Thu Feb 3 2022 Jerry James - 2.9.3-1 +- Version 2.9.3 +- Note the bundling of ocaml-incremental-cycles + * Wed Jan 26 2022 Richard W.M. Jones - 2.9.1-5 - Rebuild to pick up new ocaml dependency diff --git a/sources b/sources index 6429163..e6c2489 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.9.1.tar.gz) = 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77 +SHA512 (dune-2.9.3.tar.gz) = df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494