Fix a changelog entry

Includes Tcl 9 support (RHBZ#2337740)

.gitignore

@@ -8,3 +8,5 @@
 /labltk-8.06.11.tar.gz
 /labltk-8.06.12.tar.gz
 /labltk-8.06.13.tar.gz
+/labltk-8.06.14.tar.gz
+/labltk-8.06.15.tar.gz

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}

ocaml-labltk-configure-c99.patch

@@ -1,21 +0,0 @@
-Avoid implicit int because it was removed from the language. Future
-compilers will not support implicit ints by default, leading to
-compilation failures.
-
-Submitted upstream: <https://github.com/garrigue/labltk/pull/21>
-
-diff --git a/config/auto-aux/tclversion.c b/config/auto-aux/tclversion.c
-index 4608ee9f91a51e88..4c703c58284f3aa3 100644
---- a/config/auto-aux/tclversion.c
-+++ b/config/auto-aux/tclversion.c
-@@ -18,7 +18,9 @@
- #include <tcl.h>
- #include <tk.h>
- 
--main ()
-+int
-+main (void)
- {
-     puts(TCL_VERSION);
-+    return 0;
- }

ocaml-labltk.spec

@@ -1,14 +1,15 @@
+# This breaks basic usage of the package:
+# ocamlfind ocamlopt -package labltk tktest.ml -linkpkg -o tktest
+# gcc: fatal error: environment variable ‘RPM_ARCH’ not defined
+%undefine _package_note_flags
+
 # OCaml packages not built on i686 since OCaml 5 / Fedora 39.
 ExcludeArch: %{ix86}
 
-%ifarch %{ocaml_native_compiler}
-%global native_compiler 1
-%else
-%global native_compiler 0
-%endif
+%global giturl https://github.com/garrigue/labltk
 
 Name:          ocaml-labltk
-Version:       8.06.13
+Version:       8.06.15
 Release:       4%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
@@ -16,7 +17,8 @@ Summary:       Tcl/Tk interface for OCaml
 License:       LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
 
 URL:           https://garrigue.github.io/labltk/
-Source0:       https://github.com/garrigue/labltk/archive/%{version}/labltk-%{version}.tar.gz
+VCS:           git:%{giturl}.git
+Source0:       %{giturl}/archive/%{version}/labltk-%{version}.tar.gz
 
 # This adds debugging (-g) everywhere.
 Patch1:        labltk-8.06.11-enable-debugging.patch
@@ -24,13 +26,10 @@ Patch1:        labltk-8.06.11-enable-debugging.patch
 # Resolve an issue with ./configure and Tcl detection.
 Patch2:        labltk-8.06.12-use-fpic-configure.patch
 
-# Avoid implicit int because it was removed from the C language
-Patch3:        ocaml-labltk-configure-c99.patch
-
 BuildRequires: make
 BuildRequires: ocaml
 BuildRequires: ocaml-ocamldoc
-BuildRequires: python3
+BuildRequires: ocaml-rpm-macros
 BuildRequires: tcl-devel, tk-devel
 
 %global _desc %{expand:
@@ -86,19 +85,19 @@ sed -i 's/^cclibs=.*/cclibs=/' configure
 # Build does not work in parallel.
 unset MAKEFLAGS
 
-%if !%{native_compiler}
-make byte
-%else
+%ifarch %{ocaml_native_compiler}
 make all opt \
      SHAREDCCCOMPOPTS='%{build_cflags} -fPIC' \
      TK_LINK="%{build_ldflags} $(pkg-config --libs tk)"
+%else
+make byte
 %endif
 
 # Build documentation
 # make apiref does not work
 MLIS=$(ls -1d labltk/*.mli | grep -Fv _tkgen.mli)
 mkdir apiref
-/usr/bin/ocamldoc -I +threads -I support -I labltk -I camltk \
+/usr/bin/ocamldoc -I +unix -I +threads -I support -I labltk -I camltk \
   support/fileevent.mli support/support.mli support/textvariable.mli \
   support/timer.mli support/tkthread.mli support/widget.mli $MLIS \
   labltk/tk.ml -sort -d apiref -html
@@ -135,6 +134,56 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 8.06.15-4
+- OCaml 5.4.0 rebuild
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 8.06.15-2
+- Rebuild to fix OCaml dependencies
+
+* Mon Feb 03 2025 Richard W.M. Jones <rjones@redhat.com> - 8.06.15-1
+- New upstream version 8.06.15
+- Includes Tcl 9 support (RHBZ#2337740)
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jan  9 2025 Jerry James <loganjerry@gmail.com> - 8.06.14-2
+- OCaml 5.3.0 rebuild for Fedora 42
+
+* Thu Aug  1 2024 Jerry James <loganjerry@gmail.com> - 8.06.14-1
+- Version 8.06.14
+- Drop upstreamed patch to avoid implicit int in configure
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.13-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 8.06.13-12
+- OCaml 5.2.0 ppc64le fix
+
+* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 8.06.13-11
+- OCaml 5.2.0 for Fedora 41
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.13-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.13-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 8.06.13-8
+- OCaml 5.1.1 + s390x code gen fix for Fedora 40
+
+* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 8.06.13-7
+- OCaml 5.1.1 rebuild for Fedora 40
+
+* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 8.06.13-6
+- OCaml 5.1 rebuild for Fedora 40
+
+* Wed Oct  4 2023 Jerry James <loganjerry@gmail.com> - 8.06.13-5
+- Depend on ocaml-rpm-macros instead of python3
+
 * Sat Sep  9 2023 Jerry James <loganjerry@gmail.com> - 8.06.13-4
 - Add devel package dependency on tcl-/tk-devel
 

sources

@@ -1 +1 @@
-SHA512 (labltk-8.06.13.tar.gz) = bc31f360902b2dac573683d5be148ed1437ab94ba08447bb1f649f1f62ebe94956c3fc98ca6136887528084828402b224e982e9d367d8814708114ade92749c1
+SHA512 (labltk-8.06.15.tar.gz) = 67feb7f51be2a837050dc0b94a4cd185f05db240cdbb1188d5787465dd2abed98b17244c66893ad18ef912fbbe960b90a3e116a9f283a6277b6a747043780e24

tests/basic-test.sh

@@ -0,0 +1,9 @@
+#!/bin/bash -
+set -e
+set -x
+
+# Compile trivial tk program.
+echo 'ignore (Tk.opentk ())' > tktest.ml
+ocamlfind ocamlopt -package labltk tktest.ml -linkpkg -o tktest
+# Unfortunately we can't run this as we won't have an X server available.
+#./tktest

tests/tests.yml

@@ -0,0 +1,13 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    required_packages:
+    - ocaml
+    - ocaml-findlib
+    - ocaml-labltk-devel
+    tests:
+    - simple:
+        dir: .
+        run: ./basic-test.sh