diff --git a/ocaml-sedlex-no-curl.patch b/ocaml-sedlex-no-curl.patch index 9dd80f9..55864b6 100644 --- a/ocaml-sedlex-no-curl.patch +++ b/ocaml-sedlex-no-curl.patch @@ -1,20 +1,35 @@ ---- sedlex-2.2/src/generator/data/dune.orig 2020-02-08 14:55:37.000000000 -0700 -+++ sedlex-2.2/src/generator/data/dune 2020-06-18 09:51:50.348134755 -0600 -@@ -1,14 +1,11 @@ +--- sedlex-2.6/src/generator/data/dune.orig 2022-03-29 10:23:02.000000000 -0600 ++++ sedlex-2.6/src/generator/data/dune 2022-03-30 09:10:19.151283029 -0600 +@@ -1,29 +1,11 @@ (rule - (targets DerivedCoreProperties.txt) -- (deps base_url) -- (action (run curl -L -s %{read:base_url}/ucd/DerivedCoreProperties.txt -o DerivedCoreProperties.txt))) -+ (action (copy /usr/share/unicode/ucd/DerivedCoreProperties.txt DerivedCoreProperties.txt))) + (targets DerivedCoreProperties.txt) +- (deps base_url) +- (action +- (run +- curl +- -L +- -s +- %{read:base_url}/ucd/DerivedCoreProperties.txt +- -o +- DerivedCoreProperties.txt))) ++ (action (copy /usr/share/unicode/ucd/DerivedCoreProperties.txt DerivedCoreProperties.txt))) (rule - (targets DerivedGeneralCategory.txt) -- (deps base_url) -- (action (run curl -L -s %{read:base_url}/ucd/extracted/DerivedGeneralCategory.txt -o DerivedGeneralCategory.txt))) -+ (action (copy /usr/share/unicode/ucd/extracted/DerivedGeneralCategory.txt DerivedGeneralCategory.txt))) + (targets DerivedGeneralCategory.txt) +- (deps base_url) +- (action +- (run +- curl +- -L +- -s +- %{read:base_url}/ucd/extracted/DerivedGeneralCategory.txt +- -o +- DerivedGeneralCategory.txt))) ++ (action (copy /usr/share/unicode/ucd/extracted/DerivedGeneralCategory.txt DerivedGeneralCategory.txt))) (rule - (targets PropList.txt) -- (deps base_url) -- (action (run curl -L -s %{read:base_url}/ucd/PropList.txt -o PropList.txt))) -+ (action (copy /usr/share/unicode/ucd/PropList.txt PropList.txt))) + (targets PropList.txt) +- (deps base_url) +- (action +- (run curl -L -s %{read:base_url}/ucd/PropList.txt -o PropList.txt))) ++ (action (copy /usr/share/unicode/ucd/PropList.txt PropList.txt))) diff --git a/ocaml-sedlex-uchar.patch b/ocaml-sedlex-uchar.patch index 7eb82e3..a670413 100644 --- a/ocaml-sedlex-uchar.patch +++ b/ocaml-sedlex-uchar.patch @@ -1,28 +1,19 @@ ---- a/dune-project 2021-07-31 00:53:24.000000000 -0600 -+++ b/dune-project 2021-09-01 10:35:54.195593680 -0600 +--- sedlex-2.6/dune-project.orig 2022-03-29 10:23:02.000000000 -0600 ++++ sedlex-2.6/dune-project 2022-03-30 09:12:20.352338251 -0600 @@ -21,5 +21,4 @@ extension.") - (ocaml (>= 4.04)) + (ocaml (>= 4.08)) dune - (ppxlib (>= 0.18.0)) + (ppxlib (>= 0.26.0)) - gen - uchar)) + gen)) ---- a/sedlex.opam 2021-07-31 00:53:24.000000000 -0600 -+++ b/sedlex.opam 2021-09-01 10:36:10.123626201 -0600 +--- sedlex-2.6/sedlex.opam.orig 2022-03-29 10:23:02.000000000 -0600 ++++ sedlex-2.6/sedlex.opam 2022-03-30 09:12:42.352346681 -0600 @@ -20,7 +20,6 @@ depends: [ "dune" {>= "2.8"} - "ppxlib" {>= "0.18.0"} + "ppxlib" {>= "0.26.0"} "gen" - "uchar" "odoc" {with-doc} ] build: [ ---- a/src/lib/dune 2021-07-31 00:53:24.000000000 -0600 -+++ b/src/lib/dune 2021-09-01 10:35:25.851535799 -0600 -@@ -2,5 +2,5 @@ - (name sedlex) - (public_name sedlex) - (wrapped false) -- (libraries gen uchar) -+ (libraries gen) - (flags :standard -w +A-4-9 -safe-string)) diff --git a/ocaml-sedlex.spec b/ocaml-sedlex.spec index 87a48ce..dd2932c 100644 --- a/ocaml-sedlex.spec +++ b/ocaml-sedlex.spec @@ -1,7 +1,8 @@ %undefine _package_note_flags + Name: ocaml-sedlex -Version: 2.5 -Release: 4%{?dist} +Version: 2.6 +Release: 1%{?dist} Summary: Unicode-friendly lexer generator License: MIT @@ -87,6 +88,9 @@ dune runtest --release %changelog +* Wed Apr 27 2022 Jerry James - 2.6-1 +- Version 2.6 (update for ocaml-ppxlib 0.26.0) + * Mon Feb 28 2022 Jerry James - 2.5-4 - Rebuild for ocaml-gen 1.0 - Add ocaml-seq-devel BR diff --git a/sources b/sources index d3c23ed..57db2af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ocaml-sedlex-2.5.tar.gz) = 5c511a89e43999b34e50cc820a4ac71ecd0315ef144da2af1653077d7497b2ce3658898b723a7c558693766e6bc57369349cdf78c4a4b962a23d4528161b78ef +SHA512 (ocaml-sedlex-2.6.tar.gz) = 25806a8187c423ab2bf2439cdc1970e0ad8bb9c98dd51f0f5845180656b12fa37f95c7b160db4300336f92a534887d47631f5d9a1e461bcea0f83654c1413168