From f65d6583cd25818e850952e36838ed644efc999a Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Mon, 10 Jul 2023 14:48:38 -0600
Subject: [PATCH] Version 1.0.11

Other changes:
- New project URLs
- Convert License tag to SPDX
- Build with dune
- Add %check script
---
 .gitignore        |  1 +
 ocaml-curses.spec | 89 ++++++++++++++++-------------------------------
 sources           |  2 +-
 3 files changed, 32 insertions(+), 60 deletions(-)

diff --git a/.gitignore b/.gitignore
index b7d9284..0710394 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 ocaml-curses-1.0.3.tar.gz
 /ocaml-curses-1.0.4.tar.gz
+/curses-1.0.11.tar.gz
diff --git a/ocaml-curses.spec b/ocaml-curses.spec
index c33807a..d6fc934 100644
--- a/ocaml-curses.spec
+++ b/ocaml-curses.spec
@@ -1,24 +1,16 @@
-%undefine _package_note_flags
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-
 Name:           ocaml-curses
-Version:        1.0.4
-Release:        30%{?dist}
+Version:        1.0.11
+Release:        1%{?dist}
 Summary:        OCaml bindings for ncurses
-License:        LGPLv2+
+License:        LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
 
-URL:            http://savannah.nongnu.org/projects/ocaml-tmk/
-Source0:        http://download.savannah.gnu.org/releases/ocaml-tmk/%{name}-%{version}.tar.gz
-Patch0: ocaml-curses-configure-c99.patch
+URL:            https://github.com/mbacarella/curses
+Source0:        %{url}/archive/%{version}/curses-%{version}.tar.gz
 
-BuildRequires: make
-BuildRequires:  ocaml >= 4.00.1
-BuildRequires:  ocaml-findlib-devel >= 1.3.3-3
-BuildRequires:  ncurses-devel
-BuildRequires:  gawk
-
-# Doesn't include a configure script, so we have to make one.
-BuildRequires:  autoconf, automake, libtool
+BuildRequires:  ocaml >= 4.02.0
+BuildRequires:  ocaml-dune >= 2.7
+BuildRequires:  ocaml-dune-configurator-devel
+BuildRequires:  pkgconfig(ncurses)
 
 
 %description
@@ -27,13 +19,8 @@ OCaml bindings for ncurses.
 
 %package        devel
 Summary:        Development files for %{name}
-Requires:       %{name} = %{version}-%{release}
-
-# On aarch64, it is reported that ncurses-devel is not pulled in
-# implicitly by ocaml (as is the case on x86-64 for some reason).  In
-# any case, it is likely that people installing ocaml-curses-devel
-# will desire ncurses-devel, hence:
-Requires:       ncurses-devel
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       ncurses-devel%{?_isa}
 
 
 %description    devel
@@ -42,54 +29,38 @@ developing applications that use %{name}.
 
 
 %prep
-%autosetup -p1
-
-autoreconf
+%autosetup -n curses-%{version}
 
 
 %build
-%configure --enable-widec
-make all
-%if %opt
-make opt
-%endif
+%dune_build
 
 
 %install
-export DESTDIR=$RPM_BUILD_ROOT
-export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
-mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
-%if %opt
-ocamlfind install curses META *.cmi *.cmx *.cma *.cmxa *.a *.so *.mli
-%else
-ocamlfind install curses META *.cmi *.cma *.a *.so *.mli
-%endif
+%dune_install
 
 
-%files
-%doc COPYING
-%{_libdir}/ocaml/curses
-%if %opt
-%exclude %{_libdir}/ocaml/curses/*.a
-%exclude %{_libdir}/ocaml/curses/*.cmxa
-%exclude %{_libdir}/ocaml/curses/*.cmx
-%endif
-%exclude %{_libdir}/ocaml/curses/*.mli
-%{_libdir}/ocaml/stublibs/*.so
-%{_libdir}/ocaml/stublibs/*.so.owner
+%check
+%dune_check
 
 
-%files devel
-%doc COPYING
-%if %opt
-%{_libdir}/ocaml/curses/*.a
-%{_libdir}/ocaml/curses/*.cmxa
-%{_libdir}/ocaml/curses/*.cmx
-%endif
-%{_libdir}/ocaml/curses/*.mli
+%files -f .ofiles
+%doc CHANGES.md README.md
+%license COPYING
+
+
+%files devel -f .ofiles-devel
+%license COPYING
 
 
 %changelog
+* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 1.0.11-1
+- Version 1.0.11
+- New project URLs
+- Convert License tag to SPDX
+- Build with dune
+- Add %%check script
+
 * Tue Apr 25 2023 Florian Weimer <fweimer@redhat.com> - 1.0.4-30
 - Port configure script to C99
 
diff --git a/sources b/sources
index 66bdcee..bee858a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ocaml-curses-1.0.4.tar.gz) = a49838f1d32bf96fda6c612ac1b38316f61c49aa015e61e49681eacf863234f36ffe71d4305dd34f8e3b0a5dc6d9757919a107bcfdf46bd90df128e975560948
+SHA512 (curses-1.0.11.tar.gz) = 343113ab56ce339d8dc534087c27c88513a15a7d4337187f0d8e939c05730c6f2f4e6ddb2bfa6eed96b38d8e0271762d34be0ecf94bbfcbaeef29c12a362c672