From 9e17677ab75ba69bf29f3ddae9c99da516dc0644 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 4 Oct 2023 21:03:40 -0600 Subject: [PATCH 01/21] 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 - 8.06.13-5 +- Depend on ocaml-rpm-macros instead of python3 + * Sat Sep 9 2023 Jerry James - 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" Date: Thu, 5 Oct 2023 12:07:34 +0100 Subject: [PATCH 02/21] 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 - 8.06.13-6 +- OCaml 5.1 rebuild for Fedora 40 + * Wed Oct 4 2023 Jerry James - 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" Date: Tue, 12 Dec 2023 08:29:04 +0000 Subject: [PATCH 03/21] 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 - 8.06.13-7 +- OCaml 5.1.1 rebuild for Fedora 40 + * Thu Oct 05 2023 Richard W.M. Jones - 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" Date: Mon, 18 Dec 2023 13:09:08 +0000 Subject: [PATCH 04/21] 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 - 8.06.13-8 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + * Tue Dec 12 2023 Richard W.M. Jones - 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 Date: Sun, 21 Jan 2024 10:18:16 +0000 Subject: [PATCH 05/21] 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 - 8.06.13-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 18 2023 Richard W.M. Jones - 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 Date: Thu, 25 Jan 2024 10:03:04 +0000 Subject: [PATCH 06/21] 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 - 8.06.13-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 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 Date: Thu, 23 May 2024 09:17:25 -0600 Subject: [PATCH 07/21] 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" Date: Wed, 29 May 2024 17:22:34 +0100 Subject: [PATCH 08/21] 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 - 8.06.13-11 +- OCaml 5.2.0 for Fedora 41 + * Thu Jan 25 2024 Fedora Release Engineering - 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" Date: Wed, 19 Jun 2024 09:32:39 +0100 Subject: [PATCH 09/21] 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" Date: Wed, 19 Jun 2024 09:34:40 +0100 Subject: [PATCH 10/21] 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" Date: Wed, 19 Jun 2024 11:25:17 +0100 Subject: [PATCH 11/21] 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 - 8.06.13-12 +- OCaml 5.2.0 ppc64le fix + * Wed May 29 2024 Richard W.M. Jones - 8.06.13-11 - OCaml 5.2.0 for Fedora 41 From 923c2c4396e796a1fd0ee5bf26fdec6ca1e8ade0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Jul 2024 14:27:03 -0600 Subject: [PATCH 12/21] 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 Date: Thu, 18 Jul 2024 20:09:25 +0000 Subject: [PATCH 13/21] 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 - 8.06.13-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 19 2024 Richard W.M. Jones - 8.06.13-12 - OCaml 5.2.0 ppc64le fix From d07ed4dd091e2a8b0052a53584be510961d746fc Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 1 Aug 2024 12:54:00 -0600 Subject: [PATCH 14/21] 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: - -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 - #include - --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 - 8.06.14-1 +- Version 8.06.14 +- Drop upstreamed patch to avoid implicit int in configure + * Thu Jul 18 2024 Fedora Release Engineering - 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 Date: Thu, 9 Jan 2025 09:45:56 -0700 Subject: [PATCH 15/21] 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 - 8.06.14-2 +- OCaml 5.3.0 rebuild for Fedora 42 + * Thu Aug 1 2024 Jerry James - 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 Date: Fri, 17 Jan 2025 20:52:37 +0000 Subject: [PATCH 16/21] 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 - 8.06.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 9 2025 Jerry James - 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" Date: Mon, 3 Feb 2025 09:21:15 +0000 Subject: [PATCH 17/21] 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 - 8.06.15-1 +- New upstream version 8.06.15 +- Includes Tcl 9 support (RHBZ#2337740) + * Fri Jan 17 2025 Fedora Release Engineering - 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 Date: Fri, 11 Jul 2025 10:04:04 -0600 Subject: [PATCH 18/21] 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 - 8.06.15-2 +- Rebuild to fix OCaml dependencies + * Mon Feb 03 2025 Richard W.M. Jones - 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 Date: Thu, 24 Jul 2025 23:12:15 +0000 Subject: [PATCH 19/21] 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 - 8.06.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 11 2025 Jerry James - 8.06.15-2 - Rebuild to fix OCaml dependencies From 7501718a0724dc86ac36f995a47d6edf95a18246 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Oct 2025 13:33:44 +0100 Subject: [PATCH 20/21] 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 - 8.06.15-4 +- OCaml 5.4.0 rebuild + * Thu Jul 24 2025 Fedora Release Engineering - 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 Date: Tue, 13 Jan 2026 17:02:51 -0700 Subject: [PATCH 21/21] 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 - 8.06.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Fri Jul 11 2025 Jerry James - 8.06.15-2 +* Fri Jul 11 2025 Jerry James - 8.06.15-2 - Rebuild to fix OCaml dependencies * Mon Feb 03 2025 Richard W.M. Jones - 8.06.15-1