From 25473728c35986fca0239b5648e5b843dab5a8c6 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Jul 11 2023 04:11:50 +0000
Subject: Version 3.2.2


Other changes:
- Convert License tag to SPDX
- Use new dune macros

---

diff --git a/ocaml-zed-uchar.patch b/ocaml-zed-uchar.patch
new file mode 100644
index 0000000..d1f662b
--- /dev/null
+++ b/ocaml-zed-uchar.patch
@@ -0,0 +1,28 @@
+--- zed-3.2.2/dune-project.orig	2023-06-20 09:56:43.000000000 -0600
++++ zed-3.2.2/dune-project	2023-06-25 12:40:35.423065845 -0600
+@@ -29,7 +29,6 @@ cursor management facilities.")
+    (>= 4.02.3))
+   react
+   result
+-  uchar
+   uutf
+   (uucp
+    (>= 2.0.0))
+--- zed-3.2.2/src/dune.orig	2023-06-20 09:56:43.000000000 -0600
++++ zed-3.2.2/src/dune	2023-06-25 12:41:01.318702996 -0600
+@@ -4,4 +4,4 @@
+  (wrapped false)
+  (flags
+   (:standard -safe-string))
+- (libraries react result uchar uutf uucp uuseg))
++ (libraries react result uutf uucp uuseg))
+--- zed-3.2.2/zed.opam.orig	2023-06-20 09:56:43.000000000 -0600
++++ zed-3.2.2/zed.opam	2023-06-25 12:40:47.021903104 -0600
+@@ -19,7 +19,6 @@ depends: [
+   "ocaml" {>= "4.02.3"}
+   "react"
+   "result"
+-  "uchar"
+   "uutf"
+   "uucp" {>= "2.0.0"}
+   "uuseg"
diff --git a/ocaml-zed.spec b/ocaml-zed.spec
index 0e5a67d..d0dd518 100644
--- a/ocaml-zed.spec
+++ b/ocaml-zed.spec
@@ -1,87 +1,74 @@
-%undefine _package_note_flags
-Name:           ocaml-zed
-Version:        3.1.0
-Release:        14%{?dist}
-Summary:        Abstract engine for text edition in OCaml
+%ifnarch %{ocaml_native_compiler}
+%global debug_package %{nil}
+%endif
 
-%global libname %(echo %{name} | sed -e 's/^ocaml-//')
+Name:           ocaml-zed
+Version:        3.2.2
+Release:        1%{?dist}
+Summary:        Abstract engine for text editing in OCaml
 
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/ocaml-community/zed
-Source0:        https://github.com/ocaml-community/zed/archive/%{version}/%{libname}-%{version}.tar.gz
+Source0:        https://github.com/ocaml-community/zed/archive/%{version}/zed-%{version}.tar.gz
+# We don't need the uchar forwards compatibility package
+Patch0:         %{name}-uchar.patch
 
-BuildRequires:  ocaml
-BuildRequires:  ocaml-camomile-devel
+BuildRequires:  ocaml >= 4.02.3
+BuildRequires:  ocaml-alcotest-devel
+BuildRequires:  ocaml-dune >= 3.0
 BuildRequires:  ocaml-react-devel
-BuildRequires:  ocaml-charinfo-width-devel
-
-BuildRequires:  ocaml-dune
+BuildRequires:  ocaml-result-devel
+BuildRequires:  ocaml-uucp-devel >= 2.0.0
+BuildRequires:  ocaml-uuseg-devel
+BuildRequires:  ocaml-uutf-devel
 
 %description
-Zed is an abstract engine for text edition. It can be used to
-write text editors, edition widgets, readlines, ... You just
+Zed is an abstract engine for text editing.  It can be used to
+write text editors, editing widgets, readlines, ...  You just
 have to connect an engine to your inputs and rendering functions
 to get an editor.
 
-Zed provides: edition state management, multiple cursor support,
+Zed provides: editing state management, multiple cursor support,
 key-binding helpers, and general purpose unicode rope
 manipulation functions.
 
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name} = %{version}-%{release}
-Requires:       ocaml-camomile-devel%{_isa}
 Requires:       ocaml-react-devel%{_isa}
-Requires:       ocaml-charinfo-width-devel%{_isa}
+Requires:       ocaml-result-devel%{_isa}
+Requires:       ocaml-uucp-devel%{_isa}
+Requires:       ocaml-uuseg-devel%{_isa}
+Requires:       ocaml-uutf-devel%{_isa}
 
 %description    devel
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
 %prep
-%autosetup -n %{libname}-%{version}
+%autosetup -n zed-%{version} -p1
 
 %build
-# It might be nice to have a %jbuilder macro that just does this.
-dune build -p %{libname} %{?_smp_mflags}
+%dune_build
 
 %install
-dune install --destdir=%{buildroot}
+%dune_install
 
-# We install the documentation with the doc macro
-rm -fr %{buildroot}%{_prefix}/doc
-
-# We do not want the ml files
-find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete
-
-%ifarch %{ocaml_native_compiler}
-# Add missing executable bits
-find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+
-%endif
+%check
+%dune_check
 
-%files
+%files -f .ofiles
 %license LICENSE
 %doc README.md CHANGES.md
-%{_libdir}/ocaml/%{libname}
-%ifarch %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/*/*.a
-%exclude %{_libdir}/ocaml/*/*.cmxa
-%exclude %{_libdir}/ocaml/*/*.cmx
-%endif
-%exclude %{_libdir}/ocaml/*/*.mli
-
-
-%files devel
-%license LICENSE
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.a
-%{_libdir}/ocaml/*/*.cmxa
-%{_libdir}/ocaml/*/*.cmx
-%endif
-%{_libdir}/ocaml/*/*.mli
 
+%files devel -f .ofiles-devel
 
 %changelog
+* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 3.2.2-1
+- Version 3.2.2
+- Convert License tag to SPDX
+- Use new dune macros
+
 * Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 3.1.0-14
 - Rebuild OCaml packages for F38
 
diff --git a/sources b/sources
index 9c2e0d9..065ea35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zed-3.1.0.tar.gz) = d4457af15f970adb7b1ed543017e590fa0ecc47171d6dd520a1397f21ce0219caa30a9db7bedb76c0602d4f6d0f0684012cc33feafe18b848d3261a460dea10a
+SHA512 (zed-3.2.2.tar.gz) = cb377ff972c8ef0501a8034c53f10d26a60c7735742945d930b26a8535de2fa36ecc9538518a26f2bed8d5e61a642408c1f0886c75945b50ad6a524ed8e1193b