diff --git a/ocaml-411.patch b/ocaml-411.patch deleted file mode 100644 index 575560e..0000000 --- a/ocaml-411.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ppx_deriving_yojson-3.5.2.old/src/ppx_deriving_yojson.cppo.ml 2020-02-20 21:01:12.000000000 +0000 -+++ ppx_deriving_yojson-3.5.new/src/ppx_deriving_yojson.cppo.ml 2020-04-22 18:15:35.242395194 +0100 -@@ -385,7 +385,7 @@ - let ty = Typ.poly poly_vars (polymorphize_ser [%type: [%t typ] -> Yojson.Safe.t]) in - let default_fun = - let type_path = String.concat "." (path @ [type_decl.ptype_name.txt]) in -- let e_type_path = Exp.constant (Pconst_string (type_path, None)) in -+ let e_type_path = Exp.constant (Pconst_string (type_path, Location.none, None)) in - [%expr fun _ -> - invalid_arg ("to_yojson: Maybe a [@@deriving yojson] is missing when extending the type "^ - [%e e_type_path])] diff --git a/ocaml-ppx-deriving-yojson.spec b/ocaml-ppx-deriving-yojson.spec index 02b4865..aa323ee 100644 --- a/ocaml-ppx-deriving-yojson.spec +++ b/ocaml-ppx-deriving-yojson.spec @@ -6,26 +6,23 @@ %global upname ppx_deriving_yojson Name: ocaml-%{srcname} -Version: 3.5.2 -Release: 6%{?dist} +Version: 3.5.3 +Release: 1%{?dist} Summary: JSON codec generator for OCaml License: MIT URL: https://github.com/ocaml-ppx/%{upname} Source0: %{url}/archive/v%{version}/%{upname}-%{version}.tar.gz -# Fix for OCaml 4.11. Sent upstream 2020-04-22. -Patch1: ocaml-411.patch - BuildRequires: ocaml >= 4.04.0 BuildRequires: ocaml-biniou-devel BuildRequires: ocaml-cppo -BuildRequires: ocaml-dune +BuildRequires: ocaml-dune >= 1.0 BuildRequires: ocaml-easy-format-devel BuildRequires: ocaml-findlib BuildRequires: ocaml-odoc BuildRequires: ocaml-ounit-devel >= 2.0.0 -BuildRequires: ocaml-ppx-deriving-devel >= 4.0 +BuildRequires: ocaml-ppx-deriving-devel >= 4.5 BuildRequires: ocaml-ppxfind BuildRequires: ocaml-ppx-tools-devel BuildRequires: ocaml-result-devel @@ -89,7 +86,7 @@ ln -s ../../src/ppx_deriving_yojson.cppo.ml _build/default dune runtest %files -%doc CHANGELOG.md CONTRIBUTING.md README.md +%doc CHANGELOG.md README.md %license LICENSE.txt %dir %{_libdir}/ocaml/%{upname}/ %dir %{_libdir}/ocaml/%{upname}/runtime/ @@ -125,6 +122,10 @@ dune runtest %doc _build/default/_doc/_odoc/ %changelog +* Wed Aug 5 2020 Jerry James - 3.5.3-1 +- Version 3.5.3 +- Drop upstreamed ocaml-411.patch + * Sat Aug 01 2020 Fedora Release Engineering - 3.5.2-6 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 4e239ac..0523c3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ppx_deriving_yojson-3.5.2.tar.gz) = 9f787553b0489d0ce7fec9923934a84331f0c65a663a3bda12bc9df89f5f4c64b399e81c3b084d8f9a774326aee0aae50d65b3c711a88b89c2397940c90dcee6 +SHA512 (ppx_deriving_yojson-3.5.3.tar.gz) = 550fe8c400fa57f3f33f4cec509df061db0d62353e0d05ffb64e02aaef74324369840297507553d9b8a8cba81f980c210d23177bf184dbe58b952a7df4aa2176