From 4b3e90f1f91f05a0091ed95bad9663193d3374da Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 28 Feb 2021 22:16:44 +0000
Subject: [PATCH 01/45] OCaml 4.12.0 build

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index d7b9d26..94edfea 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -6,7 +6,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.5
-Release:       21%{?dist}
+Release:       22%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -117,6 +117,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Sun Feb 28 22:16:43 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.5-22
+- OCaml 4.12.0 build
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.5-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 84aded0a076feb2965e47adc53dfd4780b920f07 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 28 Feb 2021 22:24:19 +0000
Subject: [PATCH 02/45] Bump release and rebuild.

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 94edfea..00c7537 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -6,7 +6,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.5
-Release:       22%{?dist}
+Release:       23%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -117,6 +117,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Sun Feb 28 22:24:19 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.5-23
+- Bump release and rebuild.
+
 * Sun Feb 28 22:16:43 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.5-22
 - OCaml 4.12.0 build
 

From 64c4e0ae4e5f91c6b1e14cf505c46978996530af Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 1 Mar 2021 09:42:13 +0000
Subject: [PATCH 03/45] New upstream version 8.06.10. Now hosted on github.

---
 .gitignore        |  1 +
 ocaml-labltk.spec | 12 ++++++++----
 sources           |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5791030..cb52f52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /labltk-8.06.3.tar.gz
 /labltk-8.06.4.tar.gz
 /labltk-8.06.5.tar.gz
+/8.06.10.tar.gz
diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 00c7537..74d1fef 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -5,15 +5,15 @@
 %endif
 
 Name:          ocaml-labltk
-Version:       8.06.5
-Release:       23%{?dist}
+Version:       8.06.10
+Release:       1%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
 License:       LGPLv2+ with exceptions
 
-URL:           https://forge.ocamlcore.org/projects/labltk/
-Source0:       https://forge.ocamlcore.org/frs/download.php/1727/labltk-%{version}.tar.gz
+URL:           https://github.com/garrigue/labltk
+Source0:       https://github.com/garrigue/labltk/archive/8.06.10.tar.gz
 
 # This adds debugging (-g) everywhere.
 Patch1:        labltk-8.06.0-enable-debugging.patch
@@ -117,6 +117,10 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Mon Mar  1 22:24:19 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.10-1
+- New upstream version 8.06.10.
+- Now hosted on github.
+
 * Sun Feb 28 22:24:19 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.5-23
 - Bump release and rebuild.
 
diff --git a/sources b/sources
index adc94e9..7e942e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (labltk-8.06.5.tar.gz) = 8a6bfefd1ba8ef1fb54c284a06067007dd48833a475e24c787c0c2100a30a5ab018606ca3e79fd0fa323b6759de0ae3c7e6ef881e662bf1d7f84e920c7bebe7a
+SHA512 (8.06.10.tar.gz) = ef797d21adac48ca5ed35d95ad05fee26f9b6c99b0510909f6087abb9580b8efd219ca65b1efddb170b5409567d83eaaac0473898f5f4db3e15ae4f39df364c8

From c9ae7f36115b846e8dfb37fd8d1e01b34cc3da65 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 15 Mar 2021 12:38:15 +0000
Subject: [PATCH 04/45] Bump and rebuild for ELN broken deps.

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 74d1fef..6ffac82 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -6,7 +6,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.10
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -117,6 +117,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.10-2
+- Bump and rebuild for ELN broken deps.
+
 * Mon Mar  1 22:24:19 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.10-1
 - New upstream version 8.06.10.
 - Now hosted on github.

From b586906f594225085a00dfbcfa1530e8474de1f7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 16:39:37 +0000
Subject: [PATCH 05/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 6ffac82..b754ca4 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -6,7 +6,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.10
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -117,6 +117,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.10-2
 - Bump and rebuild for ELN broken deps.
 

From 6888ca63113d6be8132533552866b1046c9c585c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 4 Oct 2021 17:14:54 +0100
Subject: [PATCH 06/45] OCaml 4.13.1 build

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index b754ca4..6cd3535 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -6,7 +6,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.10
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -117,6 +117,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.10-4
+- OCaml 4.13.1 build
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 36af1a8acedeb8f97105538ea659dd76d13a888a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 4 Oct 2021 17:24:31 +0100
Subject: [PATCH 07/45] Bump and rebuild for OCaml 4.13.1

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 6cd3535..1733970 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -6,7 +6,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.10
-Release:       4%{?dist}
+Release:       5%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -117,6 +117,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.10-5
+- Bump and rebuild for OCaml 4.13.1
+
 * Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.10-4
 - OCaml 4.13.1 build
 

From 2fd0a63b26dac9d3c5de5d9008ef5fa3e33a268a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 4 Oct 2021 18:38:59 +0100
Subject: [PATCH 08/45] New upstream version 8.06.11 OCaml 4.13.1 build

---
 .gitignore        |  1 +
 ocaml-labltk.spec | 12 +++++-------
 sources           |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index cb52f52..ad7edab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /labltk-8.06.4.tar.gz
 /labltk-8.06.5.tar.gz
 /8.06.10.tar.gz
+/labltk-8.06.11.tar.gz
diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 1733970..904cdd7 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -5,15 +5,15 @@
 %endif
 
 Name:          ocaml-labltk
-Version:       8.06.10
-Release:       5%{?dist}
+Version:       8.06.11
+Release:       1%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
 License:       LGPLv2+ with exceptions
 
 URL:           https://github.com/garrigue/labltk
-Source0:       https://github.com/garrigue/labltk/archive/8.06.10.tar.gz
+Source0:       https://github.com/garrigue/labltk/archive/%{version}.tar.gz
 
 # This adds debugging (-g) everywhere.
 Patch1:        labltk-8.06.0-enable-debugging.patch
@@ -117,10 +117,8 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
-* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.10-5
-- Bump and rebuild for OCaml 4.13.1
-
-* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.10-4
+* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.11-1
+- New upstream version 8.06.11
 - OCaml 4.13.1 build
 
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.10-3
diff --git a/sources b/sources
index 7e942e4..8f4ff2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (8.06.10.tar.gz) = ef797d21adac48ca5ed35d95ad05fee26f9b6c99b0510909f6087abb9580b8efd219ca65b1efddb170b5409567d83eaaac0473898f5f4db3e15ae4f39df364c8
+SHA512 (labltk-8.06.11.tar.gz) = a4ad5fa31cbc89066445bc71a0c1c016f7e299b6bf88a5f77d559c805bc78d90651988658c8a300770ca41514ad73272691feaa84179637fcc695c96bbf25dd6

From 6bf7a73629836a2a68898b5ad82576ae4eeece31 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 4 Oct 2021 19:09:29 +0100
Subject: [PATCH 09/45] Fix Source line. Combine patches into single patch and
 update to latest sources.

---
 labltk-8.06.0-enable-debugging.patch      | 28 ----------------
 labltk-8.06.11-enable-debugging.patch     | 41 +++++++++++++++++++++++
 labltk-8.06.4-enable-more-debugging.patch | 11 ------
 ocaml-labltk.spec                         |  6 ++--
 4 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 labltk-8.06.0-enable-debugging.patch
 create mode 100644 labltk-8.06.11-enable-debugging.patch
 delete mode 100644 labltk-8.06.4-enable-more-debugging.patch

diff --git a/labltk-8.06.0-enable-debugging.patch b/labltk-8.06.0-enable-debugging.patch
deleted file mode 100644
index 7e96811..0000000
--- a/labltk-8.06.0-enable-debugging.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- labltk-8.06.0.old/support/Makefile.common	2014-09-18 05:08:33.000000000 +0100
-+++ labltk-8.06.0/support/Makefile.common	2015-02-16 15:11:30.157186457 +0000
-@@ -21,17 +21,17 @@
- ## Tools from the OCaml distribution
- 
- CAMLRUN=$(BINDIR)/ocamlrun
--CAMLC=$(BINDIR)/ocamlc$(OPT)
--CAMLOPT=$(BINDIR)/ocamlopt$(OPT)
--CAMLCB=$(BINDIR)/ocamlc
--CAMLOPTB=$(BINDIR)/ocamlopt
--CAMLCOMP=$(CAMLC) -c -warn-error A-3
-+CAMLC=$(BINDIR)/ocamlc$(OPT) -g
-+CAMLOPT=$(BINDIR)/ocamlopt$(OPT) -g
-+CAMLCB=$(BINDIR)/ocamlc -g
-+CAMLOPTB=$(BINDIR)/ocamlopt -g
-+CAMLCOMP=$(CAMLC) -c -warn-error A-3 -g
- CAMLYACC=$(BINDIR)/ocamlyacc -v
- CAMLLEX=$(BINDIR)/ocamllex
--CAMLLIBR=$(CAMLC) -a
-+CAMLLIBR=$(CAMLC) -a -g
- CAMLDEP=$(BINDIR)/ocamldep
- COMPFLAGS=-g
- LINKFLAGS=
--CAMLOPTLIBR=$(CAMLOPT) -a
--MKLIB=$(BINDIR)/ocamlmklib
-+CAMLOPTLIBR=$(CAMLOPT) -a -g
-+MKLIB=$(BINDIR)/ocamlmklib -g
- CAMLRUNGEN=$(BINDIR)/ocamlrun
diff --git a/labltk-8.06.11-enable-debugging.patch b/labltk-8.06.11-enable-debugging.patch
new file mode 100644
index 0000000..71d64a5
--- /dev/null
+++ b/labltk-8.06.11-enable-debugging.patch
@@ -0,0 +1,41 @@
+diff -ur labltk-8.06.11.old/support/Makefile labltk-8.06.11/support/Makefile
+--- labltk-8.06.11.old/support/Makefile	2021-10-04 19:10:57.000196523 +0100
++++ labltk-8.06.11/support/Makefile	2021-10-04 19:18:06.263137991 +0100
+@@ -28,7 +28,7 @@
+       cltkFile.$(O) cltkMain.$(O) cltkMisc.$(O) cltkTimer.$(O) \
+       cltkVar.$(O) cltkWait.$(O) cltkImg.$(O)
+ 
+-CCFLAGS=-I$(LIBDIR)/caml $(TK_DEFS) $(SHAREDCCCOMPOPTS)
++CCFLAGS=-I$(LIBDIR)/caml $(TK_DEFS) $(SHAREDCCCOMPOPTS) -g
+ 
+ COMPFLAGS=
+ THFLAGS=-I +threads -I vmthreads
+diff -ur labltk-8.06.11.old/support/Makefile.common labltk-8.06.11/support/Makefile.common
+--- labltk-8.06.11.old/support/Makefile.common	2021-10-04 19:10:56.990196618 +0100
++++ labltk-8.06.11/support/Makefile.common	2021-10-04 19:18:06.264137981 +0100
+@@ -21,17 +21,17 @@
+ ## Tools from the OCaml distribution
+ 
+ CAMLRUN=$(BINDIR)/ocamlrun
+-CAMLC=$(BINDIR)/ocamlc$(OPT)
+-CAMLOPT=$(BINDIR)/ocamlopt$(OPT) $(WARNERR)
+-CAMLCB=$(BINDIR)/ocamlc
+-CAMLOPTB=$(BINDIR)/ocamlopt
+-CAMLCOMP=$(CAMLC) -c $(WARNERR)
++CAMLC=$(BINDIR)/ocamlc$(OPT) -g
++CAMLOPT=$(BINDIR)/ocamlopt$(OPT) $(WARNERR) -g
++CAMLCB=$(BINDIR)/ocamlc -g
++CAMLOPTB=$(BINDIR)/ocamlopt -g
++CAMLCOMP=$(CAMLC) -c $(WARNERR) -g
+ CAMLYACC=$(BINDIR)/ocamlyacc -v
+ CAMLLEX=$(BINDIR)/ocamllex
+-CAMLLIBR=$(CAMLC) -a
++CAMLLIBR=$(CAMLC) -a -g
+ CAMLDEP=$(BINDIR)/ocamldep
+ COMPFLAGS=-g
+ LINKFLAGS=
+-CAMLOPTLIBR=$(CAMLOPT) -a
+-MKLIB=$(BINDIR)/ocamlmklib
++CAMLOPTLIBR=$(CAMLOPT) -a -g
++MKLIB=$(BINDIR)/ocamlmklib -g
+ CAMLRUNGEN=$(BINDIR)/ocamlrun
diff --git a/labltk-8.06.4-enable-more-debugging.patch b/labltk-8.06.4-enable-more-debugging.patch
deleted file mode 100644
index f2a02e4..0000000
--- a/labltk-8.06.4-enable-more-debugging.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- labltk-8.06.4.old/support/Makefile	2017-10-30 09:19:07.000000000 +0000
-+++ labltk-8.06.4/support/Makefile	2017-11-07 21:24:58.244605912 +0000
-@@ -28,7 +28,7 @@
-       cltkFile.$(O) cltkMain.$(O) cltkMisc.$(O) cltkTimer.$(O) \
-       cltkVar.$(O) cltkWait.$(O) cltkImg.$(O)
- 
--CCFLAGS=-I$(LIBDIR)/caml $(TK_DEFS) $(SHAREDCCCOMPOPTS)
-+CCFLAGS=-I$(LIBDIR)/caml $(TK_DEFS) $(SHAREDCCCOMPOPTS) -g
- 
- COMPFLAGS=
- THFLAGS=-I +threads -I vmthreads
diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 904cdd7..7e42b15 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -13,11 +13,10 @@ Summary:       Tcl/Tk interface for OCaml
 License:       LGPLv2+ with exceptions
 
 URL:           https://github.com/garrigue/labltk
-Source0:       https://github.com/garrigue/labltk/archive/%{version}.tar.gz
+Source0:       https://github.com/garrigue/labltk/archive/%{version}/labltk-%{version}.tar.gz
 
 # This adds debugging (-g) everywhere.
-Patch1:        labltk-8.06.0-enable-debugging.patch
-Patch2:        labltk-8.06.4-enable-more-debugging.patch
+Patch1:        labltk-8.06.11-enable-debugging.patch
 
 BuildRequires: make
 BuildRequires: ocaml
@@ -46,7 +45,6 @@ This package contains the development files.
 %setup -q -n labltk-%{version}
 
 %patch1 -p1
-%patch2 -p1
 
 # Remove version control files which might get copied into documentation.
 find -name .gitignore -delete

From e23e8d4f04238df908e2ef796a26b22ed47ac147 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 21:46:03 +0000
Subject: [PATCH 10/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 7e42b15..ac53f73 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -6,7 +6,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.11
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -115,6 +115,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 8.06.11-1
 - New upstream version 8.06.11
 - OCaml 4.13.1 build

From 395d48be6b55901e0b494e78330fc93ed87057ad Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 4 Feb 2022 11:57:05 +0000
Subject: [PATCH 11/45] OCaml 4.13.1 rebuild to remove package notes

---
 ocaml-labltk.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index ac53f73..07ffd90 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -1,3 +1,4 @@
+%undefine _package_note_flags
 %ifarch %{ocaml_native_compiler}
 %global native_compiler 1
 %else
@@ -6,7 +7,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.11
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -115,6 +116,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 8.06.11-3
+- OCaml 4.13.1 rebuild to remove package notes
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 74be9b4609879c3b78e0a4b04e61985d23c96286 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 18 Jun 2022 14:06:32 +0100
Subject: [PATCH 12/45] OCaml 4.14.0 rebuild

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 07ffd90..3cbb1d6 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -7,7 +7,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.11
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -116,6 +116,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 8.06.11-4
+- OCaml 4.14.0 rebuild
+
 * Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 8.06.11-3
 - OCaml 4.13.1 rebuild to remove package notes
 

From 3d0e2e1c647771727ebbd76f612d9f9dad611f7d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 22 Jul 2022 01:16:34 +0000
Subject: [PATCH 13/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 3cbb1d6..f0a0486 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -7,7 +7,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.11
-Release:       4%{?dist}
+Release:       5%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -116,6 +116,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.11-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 8.06.11-4
 - OCaml 4.14.0 rebuild
 

From d471ac93b6ca3ef69359693f354fbc398fa8b87f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 20 Sep 2022 14:32:11 +0100
Subject: [PATCH 14/45] New upstream version 8.06.12

Enable verbose output from configure script.
---
 .gitignore        |  1 +
 ocaml-labltk.spec | 10 +++++++---
 sources           |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad7edab..97d27c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /labltk-8.06.5.tar.gz
 /8.06.10.tar.gz
 /labltk-8.06.11.tar.gz
+/labltk-8.06.12.tar.gz
diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index f0a0486..329c5a7 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -6,8 +6,8 @@
 %endif
 
 Name:          ocaml-labltk
-Version:       8.06.11
-Release:       5%{?dist}
+Version:       8.06.12
+Release:       1%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -60,7 +60,7 @@ echo -e 'all:\ninstall:\n' > browser/Makefile
 
 
 %build
-./configure
+./configure -verbose
 
 # Build does not work in parallel.
 unset MAKEFLAGS
@@ -116,6 +116,10 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Tue Sep 20 2022 Richard W.M. Jones <rjones@redhat.com> - 8.06.12-1
+- New upstream version 8.06.12
+- Enable verbose output from configure script.
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 8f4ff2d..d78eff7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (labltk-8.06.11.tar.gz) = a4ad5fa31cbc89066445bc71a0c1c016f7e299b6bf88a5f77d559c805bc78d90651988658c8a300770ca41514ad73272691feaa84179637fcc695c96bbf25dd6
+SHA512 (labltk-8.06.12.tar.gz) = e1564ab2d8922276bd8ad586b37308d60ca2dd563bac3cdd992d8a6ba4de26e5499350a62a1d4cb2bbb9a5b7aff609b5187aad5fba118eb55d1b4c8355d2979a

From 1f566b6963f4e71f7588227aff7a5364a97dcd1a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 20 Sep 2022 14:40:04 +0100
Subject: [PATCH 15/45] Resolve an issue with ./configure and Tcl detection.

---
 labltk-8.06.12-use-fpic-configure.patch | 28 +++++++++++++++++++++++++
 ocaml-labltk.spec                       |  4 ++++
 2 files changed, 32 insertions(+)
 create mode 100644 labltk-8.06.12-use-fpic-configure.patch

diff --git a/labltk-8.06.12-use-fpic-configure.patch b/labltk-8.06.12-use-fpic-configure.patch
new file mode 100644
index 0000000..3ce468b
--- /dev/null
+++ b/labltk-8.06.12-use-fpic-configure.patch
@@ -0,0 +1,28 @@
+This patch is required because of the following problem when linking
+the test binary in ./configure.  This seems unrelated to OCaml and
+somehow caused by changes in Tcl (or Fedora) itself:
+
+runtest: gcc -o tst -I/usr/local/include/tcl8.5 -I/usr/local/include/tk8.5 -I/usr/local/include tclversion.c  -Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -Wl,--build-id=sha1  -lm 
+tclversion.c:21:1: warning: return type defaults to 'int' [-Wimplicit-int]
+   21 | main ()
+      | ^~~~
+/usr/bin/ld: /tmp/ccDzgQio.o: relocation R_RISCV_HI20 against `a local symbol' can not be used when making a shared object; recompile with -fPIC
+/usr/bin/ld: .gnu.build.attributes has both ordered [`.gnu.build.attributes.lo.exit' in /lib64/lp64d/../lib64/lp64d/Scrt1.o] and unordered [`.gnu.build.attributes' in /lib64/lp64d/../lib64/lp64d/Scrt1.o] sections
+/usr/bin/ld: final link failed: bad value
+collect2: error: ld returned 1 exit status
+
+RWMJ 2022-09-20
+
+--- labltk-8.06.12.old/config/auto-aux/runtest	2022-09-20 14:32:40.445384080 +0100
++++ labltk-8.06.12/config/auto-aux/runtest	2022-09-20 14:37:08.035133820 +0100
+@@ -15,8 +15,8 @@
+ 
+ if test "$verbose" = yes; then
+ echo "runtest: $cc -o tst $* $cclibs" >&2
+-$cc -o tst $* $cclibs || exit 100
++$cc -fPIC -o tst $* $cclibs || exit 100
+ else
+-$cc -o tst $* $cclibs 2> /dev/null || exit 100
++$cc -fPIC -o tst $* $cclibs 2> /dev/null || exit 100
+ fi
+ exec ./tst
diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 329c5a7..d8cccce 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -19,6 +19,9 @@ Source0:       https://github.com/garrigue/labltk/archive/%{version}/labltk-%{ve
 # This adds debugging (-g) everywhere.
 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
+
 BuildRequires: make
 BuildRequires: ocaml
 BuildRequires: tcl-devel, tk-devel
@@ -46,6 +49,7 @@ This package contains the development files.
 %setup -q -n labltk-%{version}
 
 %patch1 -p1
+%patch2 -p1
 
 # Remove version control files which might get copied into documentation.
 find -name .gitignore -delete

From e56671828f3b7f4259307305f91033e6cab3f372 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 20 Sep 2022 15:06:06 +0100
Subject: [PATCH 16/45] Define RANLIB=:

The make install rule runs $(RANLIB) at various points which is
not necessary on any modern system.
---
 ocaml-labltk.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index d8cccce..3a6a050 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -85,7 +85,8 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
 make install \
     BINDIR=$RPM_BUILD_ROOT%{_bindir} \
     INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/labltk \
-    STUBLIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+    STUBLIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs \
+    RANLIB=:
 %if %{native_compiler}
 # The *.o files are not installed by the Makefile.  AIUI
 # that prevents linking with native code programs.

From e1ee03f72256160af46c64fa4b485a05e11c51a2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 22:10:13 +0000
Subject: [PATCH 17/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 3a6a050..3aa8882 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -7,7 +7,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.12
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -121,6 +121,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Tue Sep 20 2022 Richard W.M. Jones <rjones@redhat.com> - 8.06.12-1
 - New upstream version 8.06.12
 - Enable verbose output from configure script.

From 1e9a023b3b439d9af883edfe904f939150f5351d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 24 Jan 2023 08:23:52 +0000
Subject: [PATCH 18/45] Rebuild OCaml packages for F38

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 3aa8882..eeec469 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -7,7 +7,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.12
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -121,6 +121,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 8.06.12-3
+- Rebuild OCaml packages for F38
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From db01d660286ac1f22452a96d9180b6adb42a660e Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Sat, 15 Apr 2023 20:15:36 +0200
Subject: [PATCH 19/45] Port configure stage to C99

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
---
 ocaml-labltk-configure-c99.patch | 21 +++++++++++++++++++++
 ocaml-labltk.spec                |  7 ++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 ocaml-labltk-configure-c99.patch

diff --git a/ocaml-labltk-configure-c99.patch b/ocaml-labltk-configure-c99.patch
new file mode 100644
index 0000000..05f60b2
--- /dev/null
+++ b/ocaml-labltk-configure-c99.patch
@@ -0,0 +1,21 @@
+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;
+ }
diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index eeec469..476a7e3 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -7,7 +7,7 @@
 
 Name:          ocaml-labltk
 Version:       8.06.12
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -21,6 +21,7 @@ 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
+Patch3: ocaml-labltk-configure-c99.patch
 
 BuildRequires: make
 BuildRequires: ocaml
@@ -50,6 +51,7 @@ This package contains the development files.
 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Remove version control files which might get copied into documentation.
 find -name .gitignore -delete
@@ -121,6 +123,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Sat Apr 15 2023 Florian Weimer <fweimer@redhat.com> - 8.06.12-4
+- Port configure stage to C99
+
 * Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 8.06.12-3
 - Rebuild OCaml packages for F38
 

From fb15adce27206d58fd7cb0ebe1a97fcc62842e17 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Mon, 10 Jul 2023 14:13:54 -0600
Subject: [PATCH 20/45] Version 8.06.13

Other changes:
- Convert License tag to SPDX
- Update project URL
- Install META file
- New doc subpackage for the documentation
- Fix configure script failure
- Compute linker flags more robustly
- Use new OCaml macros
---
 .gitignore                            |   1 +
 labltk-8.06.11-enable-debugging.patch |  18 +++--
 ocaml-labltk.spec                     | 107 +++++++++++++++-----------
 sources                               |   2 +-
 4 files changed, 74 insertions(+), 54 deletions(-)

diff --git a/.gitignore b/.gitignore
index 97d27c1..a201cff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /8.06.10.tar.gz
 /labltk-8.06.11.tar.gz
 /labltk-8.06.12.tar.gz
+/labltk-8.06.13.tar.gz
diff --git a/labltk-8.06.11-enable-debugging.patch b/labltk-8.06.11-enable-debugging.patch
index 71d64a5..8d34e81 100644
--- a/labltk-8.06.11-enable-debugging.patch
+++ b/labltk-8.06.11-enable-debugging.patch
@@ -1,6 +1,6 @@
-diff -ur labltk-8.06.11.old/support/Makefile labltk-8.06.11/support/Makefile
---- labltk-8.06.11.old/support/Makefile	2021-10-04 19:10:57.000196523 +0100
-+++ labltk-8.06.11/support/Makefile	2021-10-04 19:18:06.263137991 +0100
+diff -ur labltk-8.06.13.old/support/Makefile labltk-8.06.13/support/Makefile
+--- labltk-8.06.13.old/support/Makefile	2022-10-31 16:54:15.000000000 -0600
++++ labltk-8.06.13/support/Makefile	2023-06-15 20:40:04.891751478 -0600
 @@ -28,7 +28,7 @@
        cltkFile.$(O) cltkMain.$(O) cltkMisc.$(O) cltkTimer.$(O) \
        cltkVar.$(O) cltkWait.$(O) cltkImg.$(O)
@@ -8,12 +8,12 @@ diff -ur labltk-8.06.11.old/support/Makefile labltk-8.06.11/support/Makefile
 -CCFLAGS=-I$(LIBDIR)/caml $(TK_DEFS) $(SHAREDCCCOMPOPTS)
 +CCFLAGS=-I$(LIBDIR)/caml $(TK_DEFS) $(SHAREDCCCOMPOPTS) -g
  
- COMPFLAGS=
+ COMPFLAGS=-I +unix
  THFLAGS=-I +threads -I vmthreads
-diff -ur labltk-8.06.11.old/support/Makefile.common labltk-8.06.11/support/Makefile.common
---- labltk-8.06.11.old/support/Makefile.common	2021-10-04 19:10:56.990196618 +0100
-+++ labltk-8.06.11/support/Makefile.common	2021-10-04 19:18:06.264137981 +0100
-@@ -21,17 +21,17 @@
+diff -ur labltk-8.06.13.old/support/Makefile.common labltk-8.06.13/support/Makefile.common
+--- labltk-8.06.13.old/support/Makefile.common.orig	2022-10-31 16:54:15.000000000 -0600
++++ labltk-8.06.13/support/Makefile.common	2023-06-15 20:40:04.891751478 -0600
+@@ -21,19 +21,19 @@
  ## Tools from the OCaml distribution
  
  CAMLRUN=$(BINDIR)/ocamlrun
@@ -39,3 +39,5 @@ diff -ur labltk-8.06.11.old/support/Makefile.common labltk-8.06.11/support/Makef
 +CAMLOPTLIBR=$(CAMLOPT) -a -g
 +MKLIB=$(BINDIR)/ocamlmklib -g
  CAMLRUNGEN=$(BINDIR)/ocamlrun
+ ifeq (x$(RANLIB),x)
+ RANLIB=":"
diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 476a7e3..b096b6d 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -1,4 +1,3 @@
-%undefine _package_note_flags
 %ifarch %{ocaml_native_compiler}
 %global native_compiler 1
 %else
@@ -6,14 +5,14 @@
 %endif
 
 Name:          ocaml-labltk
-Version:       8.06.12
-Release:       4%{?dist}
+Version:       8.06.13
+Release:       1%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
-License:       LGPLv2+ with exceptions
+License:       LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
 
-URL:           https://github.com/garrigue/labltk
+URL:           https://garrigue.github.io/labltk/
 Source0:       https://github.com/garrigue/labltk/archive/%{version}/labltk-%{version}.tar.gz
 
 # This adds debugging (-g) everywhere.
@@ -21,16 +20,22 @@ 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
-Patch3: ocaml-labltk-configure-c99.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: tcl-devel, tk-devel
 
-
-%description
+%global _desc %{expand:
 labltk or mlTk is a library for interfacing OCaml with the scripting
-language Tcl/Tk (all versions since 8.0.3, but no betas).
+language Tcl/Tk (all versions since 8.0.3, but no betas).}
+
+
+%description %_desc
 
 
 %package devel
@@ -39,31 +44,36 @@ Summary:       Tcl/Tk interface for OCaml
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 
 
-%description devel
-labltk or mlTk is a library for interfacing OCaml with the scripting
-language Tcl/Tk (all versions since 8.0.3, but no betas).
+%description devel %_desc
 
 This package contains the development files.
 
 
-%prep
-%setup -q -n labltk-%{version}
+%package doc
+Summary:       Documentation for labltk
+BuildArch:     noarch
 
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+
+%description doc %_desc
+
+This package contains the API reference.
+
+
+%prep
+%autosetup -n labltk-%{version} -p1
 
 # Remove version control files which might get copied into documentation.
 find -name .gitignore -delete
 
-# Kill -warn-error.
-find -type f | xargs sed -i -e 's/-warn-error/-w/g'
-
 # Don't build ocamlbrowser.
 mv browser browser.old
 mkdir browser
 echo -e 'all:\ninstall:\n' > browser/Makefile
 
+# Use of the hardening linker flags without the hardening C flags leads to
+# failure of the configure script.  We don't need linker flags for this step.
+sed -i 's/^cclibs=.*/cclibs=/' configure
+
 
 %build
 ./configure -verbose
@@ -75,10 +85,19 @@ unset MAKEFLAGS
 make byte
 %else
 make all opt \
-     SHAREDCCCOMPOPTS="%{optflags} -fPIC" \
-     TK_LINK="%{__global_ldflags} -ltk8.6 -ltcl8.6"
+     SHAREDCCCOMPOPTS='%{build_cflags} -fPIC' \
+     TK_LINK="%{build_ldflags} $(pkg-config --libs tk)"
 %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 \
+  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
+
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -89,40 +108,38 @@ make install \
     INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/labltk \
     STUBLIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs \
     RANLIB=:
-%if %{native_compiler}
-# The *.o files are not installed by the Makefile.  AIUI
-# that prevents linking with native code programs.
-install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
-%endif
+
+sed 's/8\.06\.6/%{version}/' support/META > \
+    $RPM_BUILD_ROOT%{ocamldir}/labltk/META
+
+%ocaml_files
 
 
-%files
+%files -f .ofiles
 %doc Changes README.mlTk
-%dir %{_libdir}/ocaml/labltk
-%{_libdir}/ocaml/labltk/*.cmi
-%{_libdir}/ocaml/labltk/*.cma
-%{_libdir}/ocaml/labltk/*.cmo
-%{_libdir}/ocaml/stublibs/dlllabltk.so
 
 
-%files devel
+%files devel -f .ofiles-devel
 %doc README.mlTk
+
+
+%files doc
 %doc examples_camltk
 %doc examples_labltk
-%{_bindir}/labltk
-%{_libdir}/ocaml/labltk/labltktop
-%{_libdir}/ocaml/labltk/pp
-%{_libdir}/ocaml/labltk/tkcompiler
-%{_libdir}/ocaml/labltk/*.a
-%if %{native_compiler}
-%{_libdir}/ocaml/labltk/*.cmxa
-%{_libdir}/ocaml/labltk/*.cmx
-%{_libdir}/ocaml/labltk/*.o
-%endif
-%{_libdir}/ocaml/labltk/*.mli
+%doc apiref
 
 
 %changelog
+* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 8.06.13-1
+- Version 8.06.13
+- Convert License tag to SPDX
+- Update project URL
+- Install META file
+- New doc subpackage for the documentation
+- Fix configure script failure
+- Compute linker flags more robustly
+- Use new OCaml macros
+
 * Sat Apr 15 2023 Florian Weimer <fweimer@redhat.com> - 8.06.12-4
 - Port configure stage to C99
 
diff --git a/sources b/sources
index d78eff7..285d3c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (labltk-8.06.12.tar.gz) = e1564ab2d8922276bd8ad586b37308d60ca2dd563bac3cdd992d8a6ba4de26e5499350a62a1d4cb2bbb9a5b7aff609b5187aad5fba118eb55d1b4c8355d2979a
+SHA512 (labltk-8.06.13.tar.gz) = bc31f360902b2dac573683d5be148ed1437ab94ba08447bb1f649f1f62ebe94956c3fc98ca6136887528084828402b224e982e9d367d8814708114ade92749c1

From 202539ca00a8cca6568d684684f0b9d03dfc9a25 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 11 Jul 2023 11:36:23 +0100
Subject: [PATCH 21/45] ExcludeArch i686
 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/)

---
 ocaml-labltk.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index b096b6d..0631995 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -1,3 +1,6 @@
+# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
+ExcludeArch: %{ix86}
+
 %ifarch %{ocaml_native_compiler}
 %global native_compiler 1
 %else

From df9adea5ea98e3d9576e0796bc556cad10ef84e7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 11 Jul 2023 20:02:16 +0100
Subject: [PATCH 22/45] OCaml 5.0 rebuild for Fedora 39

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 0631995..6ae78a1 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -9,7 +9,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.13
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -133,6 +133,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 8.06.13-2
+- OCaml 5.0 rebuild for Fedora 39
+
 * Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 8.06.13-1
 - Version 8.06.13
 - Convert License tag to SPDX

From 3d99a8ab4efbbb66d9dac41923c6e3c27c3d6a51 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 17:19:43 +0000
Subject: [PATCH 23/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 6ae78a1..d0f7602 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -9,7 +9,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.13
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -133,6 +133,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 8.06.13-2
 - OCaml 5.0 rebuild for Fedora 39
 

From 2cd4c8645ed4385824e2a354433a123109616c9b Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Sat, 9 Sep 2023 13:27:12 -0600
Subject: [PATCH 24/45] Add devel package dependency on tcl-/tk-devel

---
 ocaml-labltk.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index d0f7602..e4f97de 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -9,7 +9,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.13
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -45,6 +45,8 @@ language Tcl/Tk (all versions since 8.0.3, but no betas).}
 Summary:       Tcl/Tk interface for OCaml
 
 Requires:      %{name}%{?_isa} = %{version}-%{release}
+Requires:      tcl-devel%{?_isa}
+Requires:      tk-devel%{?_isa}
 
 
 %description devel %_desc
@@ -133,6 +135,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* Sat Sep  9 2023 Jerry James <loganjerry@gmail.com> - 8.06.13-4
+- Add devel package dependency on tcl-/tk-devel
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.13-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 9e17677ab75ba69bf29f3ddae9c99da516dc0644 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Wed, 4 Oct 2023 21:03:40 -0600
Subject: [PATCH 25/45] Depend on ocaml-rpm-macros instead of python3

---
 ocaml-labltk.spec | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index e4f97de..e1ecb9e 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -1,15 +1,9 @@
 # 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
-
 Name:          ocaml-labltk
 Version:       8.06.13
-Release:       4%{?dist}
+Release:       5%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -30,7 +24,7 @@ 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 +80,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 +129,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 

From 1fc20844d456586d0f8ea628b166b81c05e8edc3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 5 Oct 2023 12:07:34 +0100
Subject: [PATCH 26/45] OCaml 5.1 rebuild for Fedora 40

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index e1ecb9e..cbedb5a 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.13
-Release:       5%{?dist}
+Release:       6%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -129,6 +129,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 

From 48726f03c8313404d2fb8681ca93a1053b4e831c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 12 Dec 2023 08:29:04 +0000
Subject: [PATCH 27/45] OCaml 5.1.1 rebuild for Fedora 40

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index cbedb5a..4ecc31e 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.13
-Release:       6%{?dist}
+Release:       7%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -129,6 +129,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 

From 0274f84f1ebbbffbd73ef11cd89a8e019b927854 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 18 Dec 2023 13:09:08 +0000
Subject: [PATCH 28/45] OCaml 5.1.1 + s390x code gen fix for Fedora 40

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 4ecc31e..457dd8a 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.13
-Release:       7%{?dist}
+Release:       8%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -129,6 +129,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 

From e1c48389e145ce0799c27d150150873a72f3680d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 10:18:16 +0000
Subject: [PATCH 29/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 457dd8a..f066654 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.13
-Release:       8%{?dist}
+Release:       9%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -129,6 +129,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 

From 4413996d9c30668a92f263a766e8ab8082fefca8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 10:03:04 +0000
Subject: [PATCH 30/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index f066654..b31e756 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.13
-Release:       9%{?dist}
+Release:       10%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -129,6 +129,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 

From 82b115882f3243cdc2ec8187d0021e5fa1ce82b5 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Thu, 23 May 2024 09:17:25 -0600
Subject: [PATCH 31/45] Add VCS field

---
 ocaml-labltk.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index b31e756..2225577 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -10,7 +10,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:           https://github.com/garrigue/labltk
+Source0:       %{vcs}/archive/%{version}/labltk-%{version}.tar.gz
 
 # This adds debugging (-g) everywhere.
 Patch1:        labltk-8.06.11-enable-debugging.patch

From 27d6ac121c3c315a01cca830479880dddf0047b6 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 29 May 2024 17:22:34 +0100
Subject: [PATCH 32/45] OCaml 5.2.0 for Fedora 41

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 2225577..b7a7148 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.13
-Release:       10%{?dist}
+Release:       11%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -130,6 +130,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 

From 73eb2de3a92023e6522ab9fb34617312553adbe5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 19 Jun 2024 09:32:39 +0100
Subject: [PATCH 33/45] Add RHEL gating test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Actually the test fails with:

gcc: fatal error: environment variable ‘RPM_ARCH’ not defined

I believe this is caused by the package notes implementation being
broken.  We'll need to fix that separately.
---
 gating.yaml         |  6 ++++++
 tests/basic-test.sh |  9 +++++++++
 tests/tests.yml     | 13 +++++++++++++
 3 files changed, 28 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..1f39c11
--- /dev/null
+++ b/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
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100755
index 0000000..a6423db
--- /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-labltk-devel
+    tests:
+    - simple:
+        dir: .
+        run: ./basic-test.sh

From 61898bbbdf5ba1dbb340fb6986491b0369d65fe8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 19 Jun 2024 09:34:40 +0100
Subject: [PATCH 34/45] Disable package notes

---
 ocaml-labltk.spec | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index b7a7148..fbb4dc6 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -1,3 +1,8 @@
+# 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}
 

From a06993730feb66da7ba8d886a03401880a0be7ed Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 19 Jun 2024 11:25:17 +0100
Subject: [PATCH 35/45] OCaml 5.2.0 ppc64le fix

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index fbb4dc6..475a71a 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -8,7 +8,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.13
-Release:       11%{?dist}
+Release:       12%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -135,6 +135,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 

From 923c2c4396e796a1fd0ee5bf26fdec6ca1e8ade0 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Wed, 17 Jul 2024 14:27:03 -0600
Subject: [PATCH 36/45] Fix the VCS field

---
 ocaml-labltk.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 475a71a..2ffda35 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -6,6 +6,8 @@
 # OCaml packages not built on i686 since OCaml 5 / Fedora 39.
 ExcludeArch: %{ix86}
 
+%global giturl https://github.com/garrigue/labltk
+
 Name:          ocaml-labltk
 Version:       8.06.13
 Release:       12%{?dist}
@@ -15,8 +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/
-VCS:           https://github.com/garrigue/labltk
-Source0:       %{vcs}/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

From 53e4a97528b4513fe11dafd3d25c8489bab9b870 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 20:09:25 +0000
Subject: [PATCH 37/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 2ffda35..d969558 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -10,7 +10,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.13
-Release:       12%{?dist}
+Release:       13%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -137,6 +137,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 

From d07ed4dd091e2a8b0052a53584be510961d746fc Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Thu, 1 Aug 2024 12:54:00 -0600
Subject: [PATCH 38/45] Version 8.06.14

- Drop upstreamed patch to avoid implicit int in configure
---
 .gitignore                       |  1 +
 ocaml-labltk-configure-c99.patch | 21 ---------------------
 ocaml-labltk.spec                | 11 ++++++-----
 sources                          |  2 +-
 4 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 ocaml-labltk-configure-c99.patch

diff --git a/.gitignore b/.gitignore
index a201cff..7b8ef78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /labltk-8.06.11.tar.gz
 /labltk-8.06.12.tar.gz
 /labltk-8.06.13.tar.gz
+/labltk-8.06.14.tar.gz
diff --git a/ocaml-labltk-configure-c99.patch b/ocaml-labltk-configure-c99.patch
deleted file mode 100644
index 05f60b2..0000000
--- a/ocaml-labltk-configure-c99.patch
+++ /dev/null
@@ -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;
- }
diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index d969558..e3e52b2 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -9,8 +9,8 @@ ExcludeArch: %{ix86}
 %global giturl https://github.com/garrigue/labltk
 
 Name:          ocaml-labltk
-Version:       8.06.13
-Release:       13%{?dist}
+Version:       8.06.14
+Release:       1%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -26,9 +26,6 @@ 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
@@ -137,6 +134,10 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 285d3c5..9d72119 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (labltk-8.06.13.tar.gz) = bc31f360902b2dac573683d5be148ed1437ab94ba08447bb1f649f1f62ebe94956c3fc98ca6136887528084828402b224e982e9d367d8814708114ade92749c1
+SHA512 (labltk-8.06.14.tar.gz) = 7e2cfbdb44851e48e1cbde62dd185d6f6f6b7b83d9b835e77ca964b97d05daf07b1c4d2224b5e41deba21c4b4ae64f6de9b47694022c5ffe6a67eee51d943fc9

From 7ce4a81ca6776f2346ef8179936b6b816f099384 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Thu, 9 Jan 2025 09:45:56 -0700
Subject: [PATCH 39/45] OCaml 5.3.0 rebuild for Fedora 42

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index e3e52b2..880dc41 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -10,7 +10,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.14
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -134,6 +134,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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

From cb4e983e02d549341183662d830ca1ee3128c283 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 20:52:37 +0000
Subject: [PATCH 40/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 880dc41..8a1ad45 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -10,7 +10,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.14
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -134,6 +134,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 

From 279c9ea14eefbf99fd147426d468b55512652e3e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 3 Feb 2025 09:21:15 +0000
Subject: [PATCH 41/45] New upstream version 8.06.15

Includes Tcl 9 support (RHBZ#2337740)
---
 .gitignore        | 1 +
 ocaml-labltk.spec | 8 ++++++--
 sources           | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7b8ef78..8c6f0c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /labltk-8.06.12.tar.gz
 /labltk-8.06.13.tar.gz
 /labltk-8.06.14.tar.gz
+/labltk-8.06.15.tar.gz
diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 8a1ad45..c84813c 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -9,8 +9,8 @@ ExcludeArch: %{ix86}
 %global giturl https://github.com/garrigue/labltk
 
 Name:          ocaml-labltk
-Version:       8.06.14
-Release:       3%{?dist}
+Version:       8.06.15
+Release:       1%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -134,6 +134,10 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 9d72119..6a1bdd8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (labltk-8.06.14.tar.gz) = 7e2cfbdb44851e48e1cbde62dd185d6f6f6b7b83d9b835e77ca964b97d05daf07b1c4d2224b5e41deba21c4b4ae64f6de9b47694022c5ffe6a67eee51d943fc9
+SHA512 (labltk-8.06.15.tar.gz) = 67feb7f51be2a837050dc0b94a4cd185f05db240cdbb1188d5787465dd2abed98b17244c66893ad18ef912fbbe960b90a3e116a9f283a6277b6a747043780e24

From 53203f3a00f0bf898132de7569d401b9a823652b Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Fri, 11 Jul 2025 10:04:04 -0600
Subject: [PATCH 42/45] Rebuild to fix OCaml dependencies

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index c84813c..fd8d599 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -10,7 +10,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.15
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -134,6 +134,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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)

From 23c0d25764a5a6fd59f3b25706911cb62aa32605 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 23:12:15 +0000
Subject: [PATCH 43/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index fd8d599..60a711e 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -10,7 +10,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.15
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -134,6 +134,9 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 
 
 %changelog
+* 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
 

From 7501718a0724dc86ac36f995a47d6edf95a18246 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 13 Oct 2025 13:33:44 +0100
Subject: [PATCH 44/45] OCaml 5.4.0 rebuild

---
 ocaml-labltk.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 60a711e..f0d6f30 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -10,7 +10,7 @@ ExcludeArch: %{ix86}
 
 Name:          ocaml-labltk
 Version:       8.06.15
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
@@ -134,6 +134,9 @@ 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
 

From b935e7bf2de48d4c2c661a55e41701aea6fb1ef1 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Tue, 13 Jan 2026 17:02:51 -0700
Subject: [PATCH 45/45] Fix a changelog entry

---
 ocaml-labltk.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index f0d6f30..5fb9fda 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -140,7 +140,7 @@ sed 's/8\.06\.6/%{version}/' support/META > \
 * 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
+* 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