From efe85a238b5306c05d8a28f8d657d9b3c343cfa7 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Mar 22 2023 17:22:41 +0000
Subject: Version 3.1


Also:
- Drop upstreamed uchar patch
- BR ocaml-ppx-expect-devel for new tests

---

diff --git a/ocaml-sedlex-uchar.patch b/ocaml-sedlex-uchar.patch
deleted file mode 100644
index a670413..0000000
--- a/ocaml-sedlex-uchar.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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.08))
-    dune
-    (ppxlib (>= 0.26.0))
--   gen
--   uchar))
-+   gen))
---- 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.26.0"}
-   "gen"
--  "uchar"
-   "odoc" {with-doc}
- ]
- build: [
diff --git a/ocaml-sedlex.spec b/ocaml-sedlex.spec
index 44f92dd..4164edc 100644
--- a/ocaml-sedlex.spec
+++ b/ocaml-sedlex.spec
@@ -1,8 +1,8 @@
 %undefine _package_note_flags
 
 Name:           ocaml-sedlex
-Version:        3.0
-Release:        6%{?dist}
+Version:        3.1
+Release:        1%{?dist}
 Summary:        Unicode-friendly lexer generator
 
 License:        MIT
@@ -12,13 +12,11 @@ Source0:        https://github.com/ocaml-community/sedlex/archive/v%{version}/%{
 # Use local Unicode files instead of attempting to download them
 Patch0:         %{name}-no-curl.patch
 
-# Do not depend on the uchar compatibility package; our OCaml is new enough
-Patch1:         %{name}-uchar.patch
-
 BuildRequires:  ocaml
 BuildRequires:  ocaml-dune
 BuildRequires:  ocaml-odoc
 BuildRequires:  ocaml-ppxlib-devel
+BuildRequires:  ocaml-ppx-expect-devel
 BuildRequires:  ocaml-gen-devel
 BuildRequires:  unicode-ucd
 
@@ -43,12 +41,12 @@ files for developing applications that use %{name}.
 %prep
 %autosetup -p1 -n sedlex-%{version}
 
-# Upstream's regression test is written for Unicode 13.0.0 through 14.0.0.  Our
+# Upstream's regression test is written for Unicode 14.0.0 through 15.0.0.  Our
 # Unicode files may be from a more recent version of the standard.  The test has
 # a good chance of succeeding anyway, so we cross our fingers and give it a try.
 # If the regression test fails, we'll have to try another approach.
 univer=$(sed -n 's/.*PropList-\([.[:digit:]]*\)\.txt/\1/p' %{_datadir}/unicode/ucd/PropList.txt)
-sed -i "s/14\\.0\\.0/$univer/" examples/regressions.ml \
+sed -i "s/15\\.0\\.0/$univer/" examples/regressions.ml \
   src/generator/data/base_url src/syntax/unicode.ml
 
 %build
@@ -65,16 +63,21 @@ sed -i "s/14\\.0\\.0/$univer/" examples/regressions.ml \
 
 
 %files -f .ofiles
-%doc README.md CHANGES
+%doc README.md CHANGES.md
 %license LICENSE
 
 
 %files devel -f .ofiles-devel
-%doc README.md CHANGES
+%doc README.md CHANGES.md
 %license LICENSE
 
 
 %changelog
+* Wed Mar 22 2023 Jerry James <loganjerry@gmail.com> - 3.1-1
+- Version 3.1
+- Drop upstreamed uchar patch
+- BR ocaml-ppx-expect-devel for new tests
+
 * Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 3.0-6
 - Bump release and rebuild
 
diff --git a/sources b/sources
index e116260..00a3921 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ocaml-sedlex-3.0.tar.gz) = 564780b7af8b3ddd32c9164caa42fd24b2ff59e0bf9977bcee4c3ddea2be3f0c870bd95949b639c5f1942e0fa2604902f5cd3eb9041d59b6ee2367895df556df
+SHA512 (ocaml-sedlex-3.1.tar.gz) = 27c7954c03a9d78f252167708afe7d91648ad3d3aa529e00c73da75bac49c2cf552cc9d27d29f1d9a04b1e2b47b7c6de9e9850c53124ad9f311d0a8f54bb9cae