From c6590da254fe15ecafc60aadbc4d9a8b1c4d542d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Oct 2021 20:20:47 +0100 Subject: [PATCH 01/30] OCaml 4.13.1 build --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 04a9629..086c2e2 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -2,7 +2,7 @@ Name: ocaml-curses Version: 1.0.4 -Release: 22%{?dist} +Release: 23%{?dist} Summary: OCaml bindings for ncurses License: LGPLv2+ @@ -88,6 +88,9 @@ ocamlfind install curses META *.cmi *.cma *.a *.so *.mli %changelog +* Mon Oct 04 2021 Richard W.M. Jones - 1.0.4-23 +- OCaml 4.13.1 build + * Thu Jul 22 2021 Fedora Release Engineering - 1.0.4-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 180d213bc78585210b02fa16a6323ddbba70de11 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 21:42:38 +0000 Subject: [PATCH 02/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 086c2e2..f996063 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -2,7 +2,7 @@ Name: ocaml-curses Version: 1.0.4 -Release: 23%{?dist} +Release: 24%{?dist} Summary: OCaml bindings for ncurses License: LGPLv2+ @@ -88,6 +88,9 @@ ocamlfind install curses META *.cmi *.cma *.a *.so *.mli %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.0.4-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Oct 04 2021 Richard W.M. Jones - 1.0.4-23 - OCaml 4.13.1 build From 05ae9fd1adc4ec3c009e85ad4e9b7d0cbc11b3be Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Feb 2022 13:02:36 +0000 Subject: [PATCH 03/30] OCaml 4.13.1 rebuild to remove package notes --- ocaml-curses.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index f996063..60abbc5 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -1,8 +1,9 @@ +%undefine _package_note_flags %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) Name: ocaml-curses Version: 1.0.4 -Release: 24%{?dist} +Release: 25%{?dist} Summary: OCaml bindings for ncurses License: LGPLv2+ @@ -88,6 +89,9 @@ ocamlfind install curses META *.cmi *.cma *.a *.so *.mli %changelog +* Fri Feb 04 2022 Richard W.M. Jones - 1.0.4-25 +- OCaml 4.13.1 rebuild to remove package notes + * Thu Jan 20 2022 Fedora Release Engineering - 1.0.4-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From de87da566887b71b4ee6c2300eaff13a4665e6c9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 18 Jun 2022 14:40:47 +0100 Subject: [PATCH 04/30] OCaml 4.14.0 rebuild --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 60abbc5..1e5ddf6 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ Name: ocaml-curses Version: 1.0.4 -Release: 25%{?dist} +Release: 26%{?dist} Summary: OCaml bindings for ncurses License: LGPLv2+ @@ -89,6 +89,9 @@ ocamlfind install curses META *.cmi *.cma *.a *.so *.mli %changelog +* Sat Jun 18 2022 Richard W.M. Jones - 1.0.4-26 +- OCaml 4.14.0 rebuild + * Fri Feb 04 2022 Richard W.M. Jones - 1.0.4-25 - OCaml 4.13.1 rebuild to remove package notes From 270b9205539e0cbfa9aa1d041e1b53a160d27840 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 01:11:59 +0000 Subject: [PATCH 05/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 1e5ddf6..9384475 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ Name: ocaml-curses Version: 1.0.4 -Release: 26%{?dist} +Release: 27%{?dist} Summary: OCaml bindings for ncurses License: LGPLv2+ @@ -89,6 +89,9 @@ ocamlfind install curses META *.cmi *.cma *.a *.so *.mli %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.0.4-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jun 18 2022 Richard W.M. Jones - 1.0.4-26 - OCaml 4.14.0 rebuild From e2fa7f17231b2c1b8176573e2351a305f828b726 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:06:40 +0000 Subject: [PATCH 06/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 9384475..a4814fd 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ Name: ocaml-curses Version: 1.0.4 -Release: 27%{?dist} +Release: 28%{?dist} Summary: OCaml bindings for ncurses License: LGPLv2+ @@ -89,6 +89,9 @@ ocamlfind install curses META *.cmi *.cma *.a *.so *.mli %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.0.4-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 1.0.4-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c1d0f74457692cc04445e7294ad88556bf304263 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 24 Jan 2023 09:04:06 +0000 Subject: [PATCH 07/30] Rebuild OCaml packages for F38 --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index a4814fd..cf21825 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ Name: ocaml-curses Version: 1.0.4 -Release: 28%{?dist} +Release: 29%{?dist} Summary: OCaml bindings for ncurses License: LGPLv2+ @@ -89,6 +89,9 @@ ocamlfind install curses META *.cmi *.cma *.a *.so *.mli %changelog +* Tue Jan 24 2023 Richard W.M. Jones - 1.0.4-29 +- Rebuild OCaml packages for F38 + * Thu Jan 19 2023 Fedora Release Engineering - 1.0.4-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e8e99a06d225bc36eaf9ae5eb51a269538a20ad4 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 25 Apr 2023 17:33:04 +0200 Subject: [PATCH 08/30] Port configure script to C99 Related to: --- ocaml-curses-configure-c99.patch | 20 ++++++++++++++++++++ ocaml-curses.spec | 8 ++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 ocaml-curses-configure-c99.patch diff --git a/ocaml-curses-configure-c99.patch b/ocaml-curses-configure-c99.patch new file mode 100644 index 0000000..a09c1bd --- /dev/null +++ b/ocaml-curses-configure-c99.patch @@ -0,0 +1,20 @@ +Define NCURSES_WIDECHAR, so that actually declares +the probed addnwstr function. This follows Thomas Dickey's suggestion +on the bug-ncurses list: + + + +Submitted upstream: + +diff --git a/configure.ac b/configure.ac +index 15ca4087b5d9ee2b..24d5fa48960a5601 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -126,6 +126,7 @@ then + AC_MSG_CHECKING(for wide character support in ncurses library) + AC_TRY_LINK( + [#include ++ #define NCURSES_WIDECHAR 1 + #include CURSES_HEADER + ], + [wchar_t wch = 0; diff --git a/ocaml-curses.spec b/ocaml-curses.spec index cf21825..c33807a 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,12 +3,13 @@ Name: ocaml-curses Version: 1.0.4 -Release: 29%{?dist} +Release: 30%{?dist} Summary: OCaml bindings for ncurses License: LGPLv2+ 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 BuildRequires: make BuildRequires: ocaml >= 4.00.1 @@ -41,7 +42,7 @@ developing applications that use %{name}. %prep -%setup -q +%autosetup -p1 autoreconf @@ -89,6 +90,9 @@ ocamlfind install curses META *.cmi *.cma *.a *.so *.mli %changelog +* Tue Apr 25 2023 Florian Weimer - 1.0.4-30 +- Port configure script to C99 + * Tue Jan 24 2023 Richard W.M. Jones - 1.0.4-29 - Rebuild OCaml packages for F38 From f65d6583cd25818e850952e36838ed644efc999a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 10 Jul 2023 14:48:38 -0600 Subject: [PATCH 09/30] 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 - 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 - 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 From 8fff7344328ffa94c27504c8045971c35f11d154 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 11:36:23 +0100 Subject: [PATCH 10/30] ExcludeArch i686 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/) --- ocaml-curses.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index d6fc934..2d61dab 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -1,3 +1,6 @@ +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} + Name: ocaml-curses Version: 1.0.11 Release: 1%{?dist} From 5662d0f9f7378f15775f698bea49c4e2486c6e9d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 21:36:44 +0100 Subject: [PATCH 11/30] OCaml 5.0 rebuild for Fedora 39 --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 2d61dab..8f1f090 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -57,6 +57,9 @@ developing applications that use %{name}. %changelog +* Tue Jul 11 2023 Richard W.M. Jones - 1.0.11-2 +- OCaml 5.0 rebuild for Fedora 39 + * Mon Jul 10 2023 Jerry James - 1.0.11-1 - Version 1.0.11 - New project URLs From 477c6aa0382ee12ac5830a639e9e14add2b5c0e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 17:15:52 +0000 Subject: [PATCH 12/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 8f1f090..6a90b89 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -57,6 +57,9 @@ developing applications that use %{name}. %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.0.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Richard W.M. Jones - 1.0.11-2 - OCaml 5.0 rebuild for Fedora 39 From e242b95f74beae74908503f09b137dabce718bbd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Oct 2023 15:03:39 +0100 Subject: [PATCH 13/30] OCaml 5.1 rebuild for Fedora 40 --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 6a90b89..d719fad 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -57,6 +57,9 @@ developing applications that use %{name}. %changelog +* Thu Oct 05 2023 Richard W.M. Jones - 1.0.11-4 +- OCaml 5.1 rebuild for Fedora 40 + * Thu Jul 20 2023 Fedora Release Engineering - 1.0.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From cc72dd252cef71b516ede5042d7546fdc29b02ee Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Dec 2023 12:25:14 +0000 Subject: [PATCH 14/30] OCaml 5.1.1 rebuild for Fedora 40 --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index d719fad..6a02d73 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -57,6 +57,9 @@ developing applications that use %{name}. %changelog +* Tue Dec 12 2023 Richard W.M. Jones - 1.0.11-5 +- OCaml 5.1.1 rebuild for Fedora 40 + * Thu Oct 05 2023 Richard W.M. Jones - 1.0.11-4 - OCaml 5.1 rebuild for Fedora 40 From 4f21a9c62209a465ae82e9ea9b7976c98329dd28 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Dec 2023 13:47:39 +0000 Subject: [PATCH 15/30] OCaml 5.1.1 + s390x code gen fix for Fedora 40 --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 6a02d73..af33376 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -57,6 +57,9 @@ developing applications that use %{name}. %changelog +* Mon Dec 18 2023 Richard W.M. Jones - 1.0.11-6 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + * Tue Dec 12 2023 Richard W.M. Jones - 1.0.11-5 - OCaml 5.1.1 rebuild for Fedora 40 From 687d640ed43a7c1610734ff5d1adea883bbe3f5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 10:14:50 +0000 Subject: [PATCH 16/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index af33376..7478e0a 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -57,6 +57,9 @@ developing applications that use %{name}. %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.0.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 18 2023 Richard W.M. Jones - 1.0.11-6 - OCaml 5.1.1 + s390x code gen fix for Fedora 40 From 9686b293492f53ab884aaeca941c3c2f7c0d9980 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 09:56:36 +0000 Subject: [PATCH 17/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 7478e0a..3dccb6e 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -57,6 +57,9 @@ developing applications that use %{name}. %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.0.11-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.0.11-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 31219fa022f90d753cc59b7ef928a872f7a5484c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 23 May 2024 09:36:46 -0600 Subject: [PATCH 18/30] Remove unused configure patch --- ocaml-curses-configure-c99.patch | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 ocaml-curses-configure-c99.patch diff --git a/ocaml-curses-configure-c99.patch b/ocaml-curses-configure-c99.patch deleted file mode 100644 index a09c1bd..0000000 --- a/ocaml-curses-configure-c99.patch +++ /dev/null @@ -1,20 +0,0 @@ -Define NCURSES_WIDECHAR, so that actually declares -the probed addnwstr function. This follows Thomas Dickey's suggestion -on the bug-ncurses list: - - - -Submitted upstream: - -diff --git a/configure.ac b/configure.ac -index 15ca4087b5d9ee2b..24d5fa48960a5601 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -126,6 +126,7 @@ then - AC_MSG_CHECKING(for wide character support in ncurses library) - AC_TRY_LINK( - [#include -+ #define NCURSES_WIDECHAR 1 - #include CURSES_HEADER - ], - [wchar_t wch = 0; From 292fd7e6edf3d8272896dae6a72173fb7d06d3eb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 29 May 2024 20:46:33 +0100 Subject: [PATCH 19/30] OCaml 5.2.0 for Fedora 41 --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 3dccb6e..6b40071 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 8%{?dist} +Release: 9%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -57,6 +57,9 @@ developing applications that use %{name}. %changelog +* Wed May 29 2024 Richard W.M. Jones - 1.0.11-9 +- OCaml 5.2.0 for Fedora 41 + * Thu Jan 25 2024 Fedora Release Engineering - 1.0.11-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ba0a39ec39202773dd38548b5b5e251ed907e287 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 09:17:58 +0100 Subject: [PATCH 20/30] Add RHEL gating test --- gating.yaml | 6 ++++++ tests/basic-test.sh | 8 ++++++++ tests/tests.yml | 13 +++++++++++++ 3 files changed, 27 insertions(+) create mode 100755 gating.yaml create mode 100755 tests/basic-test.sh create mode 100755 tests/tests.yml diff --git a/gating.yaml b/gating.yaml new file mode 100755 index 0000000..2c7ed80 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/tests/basic-test.sh b/tests/basic-test.sh new file mode 100755 index 0000000..6044bbf --- /dev/null +++ b/tests/basic-test.sh @@ -0,0 +1,8 @@ +#!/bin/bash - +set -e +set -x + +# Compile trivial curses program. +echo 'open Curses;; ignore (initscr ()); endwin ()' > cursestest.ml +ocamlfind ocamlopt -package curses cursestest.ml -linkpkg -o cursestest +./cursestest diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100755 index 0000000..a184de7 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,13 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + required_packages: + - ocaml + - ocaml-findlib + - ocaml-curses-devel + tests: + - simple: + dir: . + run: ./basic-test.sh From b3a0de78c6da8bac529f426583500b99348af875 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 13:41:08 +0100 Subject: [PATCH 21/30] OCaml 5.2.0 ppc64le fix --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 6b40071..94a1f02 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 9%{?dist} +Release: 10%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -57,6 +57,9 @@ developing applications that use %{name}. %changelog +* Wed Jun 19 2024 Richard W.M. Jones - 1.0.11-10 +- OCaml 5.2.0 ppc64le fix + * Wed May 29 2024 Richard W.M. Jones - 1.0.11-9 - OCaml 5.2.0 for Fedora 41 From e2f5b1d1907ad5d9ccbc64c313a5985c5dfed761 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 22:05:42 +0100 Subject: [PATCH 22/30] tests: Don't run the test --- tests/basic-test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/basic-test.sh b/tests/basic-test.sh index 6044bbf..c4fae27 100755 --- a/tests/basic-test.sh +++ b/tests/basic-test.sh @@ -5,4 +5,6 @@ set -x # Compile trivial curses program. echo 'open Curses;; ignore (initscr ()); endwin ()' > cursestest.ml ocamlfind ocamlopt -package curses cursestest.ml -linkpkg -o cursestest -./cursestest +# We can't run this because there is no controlling terminal in +# the test environment. +#./cursestest From 7e00743a0cd95ba8b3614ba6f610298d39fa78be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:05:18 +0000 Subject: [PATCH 23/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 94a1f02..74234f7 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 10%{?dist} +Release: 11%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -57,6 +57,9 @@ developing applications that use %{name}. %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.0.11-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 19 2024 Richard W.M. Jones - 1.0.11-10 - OCaml 5.2.0 ppc64le fix From 58381a97690f715b5211785d95f1c42cc6008bdf Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 26 Dec 2024 20:16:27 -0700 Subject: [PATCH 24/30] Add VCS field --- ocaml-curses.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 74234f7..8411ffa 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -8,6 +8,7 @@ Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception URL: https://github.com/mbacarella/curses +VCS: git:%{url}.git Source0: %{url}/archive/%{version}/curses-%{version}.tar.gz BuildRequires: ocaml >= 4.02.0 @@ -57,6 +58,9 @@ developing applications that use %{name}. %changelog +* Thu Dec 26 2024 Jerry James - 1.0.11-12 +- Add VCS field + * Thu Jul 18 2024 Fedora Release Engineering - 1.0.11-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 55d11a8fc9b569ccc3ff97e0c21ad1bc8916ce7f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 9 Jan 2025 10:41:37 -0700 Subject: [PATCH 25/30] OCaml 5.3.0 rebuild for Fedora 42 --- ocaml-curses.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 8411ffa..677c14d 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 11%{?dist} +Release: 12%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -58,7 +58,8 @@ developing applications that use %{name}. %changelog -* Thu Dec 26 2024 Jerry James - 1.0.11-12 +* Thu Jan 9 2025 Jerry James - 1.0.11-12 +- OCaml 5.3.0 rebuild for Fedora 42 - Add VCS field * Thu Jul 18 2024 Fedora Release Engineering - 1.0.11-11 From 76ea6f84d1921906ea89f64914ee80a1a790a7cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 20:47:42 +0000 Subject: [PATCH 26/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 677c14d..8508590 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 12%{?dist} +Release: 13%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -58,6 +58,9 @@ developing applications that use %{name}. %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.0.11-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 9 2025 Jerry James - 1.0.11-12 - OCaml 5.3.0 rebuild for Fedora 42 - Add VCS field From 62978c62caa761cba0a10e52ec27763fa62c25c0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 11 Jul 2025 11:43:24 -0600 Subject: [PATCH 27/30] Rebuild to fix OCaml dependencies --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 8508590..6a86e18 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 13%{?dist} +Release: 14%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -58,6 +58,9 @@ developing applications that use %{name}. %changelog +* Fri Jul 11 2025 Jerry James - 1.0.11-14 +- Rebuild to fix OCaml dependencies + * Fri Jan 17 2025 Fedora Release Engineering - 1.0.11-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 84f65b6c788423d3046a84bdd97d915923077466 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:10:05 +0000 Subject: [PATCH 28/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 6a86e18..78c6d2d 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 14%{?dist} +Release: 15%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -58,6 +58,9 @@ developing applications that use %{name}. %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.0.11-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 11 2025 Jerry James - 1.0.11-14 - Rebuild to fix OCaml dependencies From 65379b064c38f8b173cce0906f73df3c09d2fb23 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Oct 2025 19:37:46 +0100 Subject: [PATCH 29/30] OCaml 5.4.0 rebuild --- ocaml-curses.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 78c6d2d..3b55851 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-curses Version: 1.0.11 -Release: 15%{?dist} +Release: 16%{?dist} Summary: OCaml bindings for ncurses License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -58,6 +58,9 @@ developing applications that use %{name}. %changelog +* Mon Oct 13 2025 Richard W.M. Jones - 1.0.11-16 +- OCaml 5.4.0 rebuild + * Thu Jul 24 2025 Fedora Release Engineering - 1.0.11-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 486e2bf87e8d036fa5234dc9be43901c24ec5b12 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 13 Jan 2026 16:13:45 -0700 Subject: [PATCH 30/30] Fix a changelog entry --- ocaml-curses.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 3b55851..acd84de 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -64,7 +64,7 @@ developing applications that use %{name}. * Thu Jul 24 2025 Fedora Release Engineering - 1.0.11-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Fri Jul 11 2025 Jerry James - 1.0.11-14 +* Fri Jul 11 2025 Jerry James - 1.0.11-14 - Rebuild to fix OCaml dependencies * Fri Jan 17 2025 Fedora Release Engineering - 1.0.11-13