diff --git a/.gitignore b/.gitignore index 633bb71..b98fa9e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ findlib-1.2.5.tar.gz /findlib-1.7.3.tar.gz /findlib-1.8.0.tar.gz /findlib-1.8.1.tar.gz +/findlib-1.9.tar.gz diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 3b82e14..a480dbf 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,13 +1,12 @@ Name: ocaml-findlib -Version: 1.8.1 -Release: 26%{?dist} +Version: 1.9 +Release: 1%{?dist} Summary: Objective CAML package manager and build helper License: BSD URL: http://projects.camlcity.org/projects/findlib.html Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz -BuildRequires: make BuildRequires: ocaml >= 4.02.0 BuildRequires: ocaml-labltk-devel BuildRequires: ocaml-ocamlbuild-devel @@ -16,6 +15,7 @@ BuildRequires: ocaml-compiler-libs BuildRequires: ocaml-ocamldoc BuildRequires: m4, ncurses-devel BuildRequires: gawk +BuildRequires: make Requires: ocaml %global __ocaml_requires_opts -i Asttypes -i Parsetree @@ -38,6 +38,9 @@ developing applications that use %{name}. %prep %setup -q -n findlib-%{version} +# Stray backslash in findlib 1.9. Fix sent upstream 2021-03-15. +sed -i -e 's/\(test.*camlp4.*\) \\$/\1/' Makefile + %build ocamlc -version @@ -99,6 +102,9 @@ make install \ %changelog +* Mon Mar 15 2021 Richard W.M. Jones - 1.9-1 +- New upstream version 1.9. + * Mon Mar 15 2021 Richard W.M. Jones - 1.8.1-26 - Bump and rebuild for ELN broken deps. diff --git a/sources b/sources index 4ed6529..96b622a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (findlib-1.8.1.tar.gz) = 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1 +SHA512 (findlib-1.9.tar.gz) = b2084ef88d514cdec1ea988487f23ea006189031ff2eddf1d2f2e96db0f164856929475fbd8b5f6cf3844e8b3f0fba2aa8b7846174f1a1d815ce459eda3b661f