diff --git a/ocaml-sedlex-pervasives.patch b/ocaml-sedlex-pervasives.patch deleted file mode 100644 index ef1c166..0000000 --- a/ocaml-sedlex-pervasives.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- sedlex-2.2/src/generator/gen_unicode.ml.inc.orig 2020-02-08 14:55:37.000000000 -0700 -+++ sedlex-2.2/src/generator/gen_unicode.ml.inc 2020-06-17 21:22:50.269177776 -0600 -@@ -77,14 +77,14 @@ let split list n = - - let print_elements ch hashtbl = - let cats = -- List.sort_uniq Pervasives.compare -+ List.sort_uniq Stdlib.compare - (Hashtbl.fold (fun cat _ l -> cat::l) hashtbl []) - in - let len = List.length cats in - List.iter (fun c -> - let entries = - List.map (fun (b,e) -> Printf.sprintf "0x%x, 0x%x" b e) -- (List.sort_uniq Pervasives.compare -+ (List.sort_uniq Stdlib.compare - (Hashtbl.find_all hashtbl c)) - in - let entries = diff --git a/ocaml-sedlex.spec b/ocaml-sedlex.spec index 76015da..a502bf5 100644 --- a/ocaml-sedlex.spec +++ b/ocaml-sedlex.spec @@ -1,23 +1,19 @@ Name: ocaml-sedlex -Version: 2.2 -Release: 2%{?dist} +Version: 2.3 +Release: 1%{?dist} Summary: Unicode-friendly lexer generator License: MIT URL: https://github.com/ocaml-community/sedlex Source0: https://github.com/ocaml-community/sedlex/archive/v%{version}/%{name}-%{version}.tar.gz -# Use Stdlib instead of Pervasives due to changes in recent OCaml versions -Patch0: %{name}-pervasives.patch - # Use local Unicode files instead of attempting to download them -Patch1: %{name}-no-curl.patch +Patch0: %{name}-no-curl.patch BuildRequires: ocaml BuildRequires: ocaml-dune BuildRequires: ocaml-odoc -BuildRequires: ocaml-migrate-parsetree-devel -BuildRequires: ocaml-ppx-tools-versioned-devel +BuildRequires: ocaml-ppxlib-devel BuildRequires: ocaml-gen-devel BuildRequires: unicode-ucd @@ -30,8 +26,7 @@ regular OCaml source files. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: ocaml-migrate-parsetree-devel%{?_isa} -Requires: ocaml-ppx-tools-versioned-devel%{?_isa} +Requires: ocaml-ppxlib-devel%{?_isa} Requires: ocaml-gen-devel%{?_isa} @@ -95,6 +90,10 @@ dune runtest %changelog +* Sat Feb 20 2021 Jerry James - 2.3-1 +- Version 2.3 +- Drop upstreamed -pervasives patch + * Tue Jan 26 2021 Fedora Release Engineering - 2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index fb57e2b..73aadb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ocaml-sedlex-2.2.tar.gz) = c38940654d8d2a4b8f627bc9109b0fd983c520d8db05bf4b514ddc05cf50946c086d3558dfced64cc8f2b4eaabc6155426eb44ee6d903e3520ebb65daadf990a +SHA512 (ocaml-sedlex-2.3.tar.gz) = f91bbda9e79417e0a7c723a8efd9644404ffc91c60898b8fa07a514c38bc8472eae34419405354ae80966feb8d3203943f78776ad395a16132c7c890e3dbd7d8