diff --git a/.gitignore b/.gitignore index d721205..bf027b4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /v1.4.0.tar.gz /v1.5.0.tar.gz /v1.6.4.tar.gz +/v1.6.5.tar.gz diff --git a/cppo-1.6.5-string-capitalize.patch b/cppo-1.6.5-string-capitalize.patch new file mode 100644 index 0000000..7a4fe1d --- /dev/null +++ b/cppo-1.6.5-string-capitalize.patch @@ -0,0 +1,11 @@ +--- ./cppo-1.6.5/src/cppo_eval.ml.old 2019-04-29 18:27:54.177974043 +0100 ++++ ./cppo-1.6.5/src/cppo_eval.ml 2019-04-29 18:28:01.770989363 +0100 +@@ -85,7 +85,7 @@ + let trim_compact_and_capitalize_string s = + let buf = Buffer.create (String.length s) in + trim_and_compact buf s; +- String.capitalize (Buffer.contents buf) ++ String.capitalize_ascii (Buffer.contents buf) + + let is_ident s = + let len = String.length s in diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index f573087..b841373 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -4,14 +4,17 @@ %endif Name: ocaml-cppo -Version: 1.6.4 -Release: 5%{?dist} +Version: 1.6.5 +Release: 1%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD URL: http://mjambon.com/cppo.html Source0: https://github.com/mjambon/cppo/archive/v%{version}.tar.gz +# Replace deprecated function String.capitalize. +Patch1: cppo-1.6.5-string-capitalize.patch + BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib %if !%{opt} @@ -39,6 +42,7 @@ to the robustness of cppo across OCaml versions. %prep %setup -q -n %{libname}-%{version} +%patch1 -p2 sed -i.add-debuginfo \ 's/ocamlopt/ocamlopt -g/;s/ocamlc \(-[co]\)/ocamlc -g \1/' \ Makefile @@ -68,7 +72,8 @@ make test %changelog -* Mon Apr 29 2019 Richard W.M. Jones - 1.6.4-5 +* Mon Apr 29 2019 Richard W.M. Jones - 1.6.5-1 +- New upstream version 1.6.5. - OCaml 4.08.0 (beta 3) rebuild. * Fri Feb 01 2019 Fedora Release Engineering - 1.6.4-4 diff --git a/sources b/sources index c22b611..86239cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.6.4.tar.gz) = 89c6df66d597d929be7532ad82f0206b028bdbd79a0b4b39451bce3fa5bd63a80dce931d575f69bd7066de829347498c736657dfe9610b20700a652b9b542a4d +SHA512 (v1.6.5.tar.gz) = e7955d578c4d3d9b2a2c40691b39912ecaffe5173b90394552978836da79ae963ae202899525e366a599a35913373fd7ab584748d1fcbdc4e53a442b42603061