From d5da5ca4fc013d18561be68cbcb3eabf7badd4ba Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Feb 2020 15:02:41 +0000 Subject: [PATCH 01/46] OCaml 4.10.0 final (Fedora 32). --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 2afb377..b429f75 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 28%{?dist} +Release: 28%{?dist}.1 Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -77,6 +77,9 @@ make install %changelog +* Thu Feb 27 2020 Richard W.M. Jones - 2.04-28.1 +- OCaml 4.10.0 final (Fedora 32). + * Wed Feb 26 2020 Richard W.M. Jones - 2.04-28 - OCaml 4.10.0 final. From 973c1a56648c32e5ba65fba33c41b43f80fa7c20 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Apr 2020 14:05:47 +0100 Subject: [PATCH 02/46] Update all OCaml dependencies for RPM 4.16. --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 2afb377..bd6cac7 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -77,6 +77,9 @@ make install %changelog +* Thu Apr 02 2020 Richard W.M. Jones - 2.04-29 +- Update all OCaml dependencies for RPM 4.16. + * Wed Feb 26 2020 Richard W.M. Jones - 2.04-28 - OCaml 4.10.0 final. From e3edd6a8b68ee2e17a3d27df57f12ed0a2f1dc36 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 17 Apr 2020 21:22:41 +0100 Subject: [PATCH 03/46] OCaml 4.11.0 pre-release --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index bd6cac7..8afc4ab 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -77,6 +77,9 @@ make install %changelog +* Fri Apr 17 2020 Richard W.M. Jones - 2.04-30 +- OCaml 4.11.0 pre-release + * Thu Apr 02 2020 Richard W.M. Jones - 2.04-29 - Update all OCaml dependencies for RPM 4.16. From 46292f2ded6089d738558687c14aedf218245429 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 21 Apr 2020 16:48:39 +0100 Subject: [PATCH 04/46] OCaml 4.11.0 pre-release attempt 2 --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 8afc4ab..2a0e59d 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -77,6 +77,9 @@ make install %changelog +* Tue Apr 21 2020 Richard W.M. Jones - 2.04-31 +- OCaml 4.11.0 pre-release attempt 2 + * Fri Apr 17 2020 Richard W.M. Jones - 2.04-30 - OCaml 4.11.0 pre-release From fcd3bc0ddf38421cf46891f9af3a64874e5a37c8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 May 2020 23:06:48 +0100 Subject: [PATCH 05/46] OCaml 4.11.0+dev2-2020-04-22 rebuild --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 2a0e59d..020cdff 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -77,6 +77,9 @@ make install %changelog +* Mon May 04 2020 Richard W.M. Jones - 2.04-32 +- OCaml 4.11.0+dev2-2020-04-22 rebuild + * Tue Apr 21 2020 Richard W.M. Jones - 2.04-31 - OCaml 4.11.0 pre-release attempt 2 From 3191dc541dd47b5065ecf225d2aa5bf1be5978b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 12:06:20 +0000 Subject: [PATCH 06/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 020cdff..8393789 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -77,6 +77,9 @@ make install %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.04-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon May 04 2020 Richard W.M. Jones - 2.04-32 - OCaml 4.11.0+dev2-2020-04-22 rebuild From dfc93a29b264b998ecf8df641e0fef2845efa820 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 21 Aug 2020 11:59:52 +0100 Subject: [PATCH 07/46] OCaml 4.11.0 rebuild --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 8393789..d6e74c4 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -77,6 +77,9 @@ make install %changelog +* Fri Aug 21 2020 Richard W.M. Jones - 2.04-34 +- OCaml 4.11.0 rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 2.04-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 96bfcca6748a5900f7c20190e5ca300e8dba2c3a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 1 Sep 2020 20:06:34 +0100 Subject: [PATCH 08/46] OCaml 4.11.1 rebuild --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index d6e74c4..7f5f04f 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -77,6 +77,9 @@ make install %changelog +* Tue Sep 01 2020 Richard W.M. Jones - 2.04-35 +- OCaml 4.11.1 rebuild + * Fri Aug 21 2020 Richard W.M. Jones - 2.04-34 - OCaml 4.11.0 rebuild From 66a231b42fb6b66c563ea77c187a8885208f79fc Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 06:10:34 +0000 Subject: [PATCH 09/46] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- ocaml-calendar.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 7f5f04f..b34b2aa 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -13,6 +13,7 @@ Source0: https://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04. Patch1: calendar-2.03.2-enable-debug.patch +BuildRequires: make BuildRequires: ocaml >= 4.00.1 BuildRequires: ocaml-findlib-devel >= 1.3.3-3 BuildRequires: ocaml-ocamldoc From edf6454ab7d291cd49b0a412f184a3b4f829d62c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:54:01 +0000 Subject: [PATCH 10/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index b34b2aa..4636558 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -78,6 +78,9 @@ make install %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.04-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Sep 01 2020 Richard W.M. Jones - 2.04-35 - OCaml 4.11.1 rebuild From ed0615fe29e8be9410d1adb20e7b90f10ef4f7cb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Mar 2021 14:31:56 +0000 Subject: [PATCH 11/46] OCaml 4.12.0 build --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 4636558..4d7ecba 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -78,6 +78,9 @@ make install %changelog +* Mon Mar 1 14:31:55 GMT 2021 Richard W.M. Jones - 2.04-37 +- OCaml 4.12.0 build + * Tue Jan 26 2021 Fedora Release Engineering - 2.04-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From bf53a197e3e7d7b18f003b8dba6d1726b90f6c29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 16:33:33 +0000 Subject: [PATCH 12/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 4d7ecba..44ec3c8 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -78,6 +78,9 @@ make install %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.04-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Mar 1 14:31:55 GMT 2021 Richard W.M. Jones - 2.04-37 - OCaml 4.12.0 build From 74afe2984c8d8a4f9c60c1527b66d8f78a010df3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Oct 2021 22:11:04 +0100 Subject: [PATCH 13/46] OCaml 4.13.1 build --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 44ec3c8..b5a4771 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -78,6 +78,9 @@ make install %changelog +* Mon Oct 04 2021 Richard W.M. Jones - 2.04-39 +- OCaml 4.13.1 build + * Thu Jul 22 2021 Fedora Release Engineering - 2.04-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 03b4292d2575bba356c65dc4353c86d1306d9c06 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 21:39:47 +0000 Subject: [PATCH 14/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index b5a4771..ca16489 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -4,7 +4,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -78,6 +78,9 @@ make install %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.04-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Oct 04 2021 Richard W.M. Jones - 2.04-39 - OCaml 4.13.1 build From 2bc1dac1102fcef48f9d6c5dfe984fd01c54d1fe Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Feb 2022 13:02:36 +0000 Subject: [PATCH 15/46] OCaml 4.13.1 rebuild to remove package notes --- ocaml-calendar.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index ca16489..976bbd7 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -1,10 +1,11 @@ +%undefine _package_note_flags %ifnarch %{ocaml_native_compiler} %global debug_package %{nil} %endif Name: ocaml-calendar Version: 2.04 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -78,6 +79,9 @@ make install %changelog +* Fri Feb 04 2022 Richard W.M. Jones - 2.04-41 +- OCaml 4.13.1 rebuild to remove package notes + * Thu Jan 20 2022 Fedora Release Engineering - 2.04-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 33e0a9e1b58ceebf08e8f810c63ed916a5fddad5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Feb 2022 14:22:01 +0000 Subject: [PATCH 16/46] Bump release and rebuild. --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 976bbd7..c260702 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -5,7 +5,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -79,6 +79,9 @@ make install %changelog +* Fri Feb 04 2022 Richard W.M. Jones - 2.04-42 +- Bump release and rebuild. + * Fri Feb 04 2022 Richard W.M. Jones - 2.04-41 - OCaml 4.13.1 rebuild to remove package notes From c76cf71072dca592c9cd2a09a33ccb6eeace8f52 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 18 Jun 2022 14:40:47 +0100 Subject: [PATCH 17/46] OCaml 4.14.0 rebuild --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index c260702..706fa6d 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -5,7 +5,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -79,6 +79,9 @@ make install %changelog +* Sat Jun 18 2022 Richard W.M. Jones - 2.04-43 +- OCaml 4.14.0 rebuild + * Fri Feb 04 2022 Richard W.M. Jones - 2.04-42 - Bump release and rebuild. From c62b64a88a01e6bd8533951acc5d54650362d2fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 01:07:58 +0000 Subject: [PATCH 18/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 706fa6d..dc64260 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -5,7 +5,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -79,6 +79,9 @@ make install %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 2.04-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jun 18 2022 Richard W.M. Jones - 2.04-43 - OCaml 4.14.0 rebuild From 782091172fbd6d8740e7b5ed3ad5d4c9382ba7a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:03:24 +0000 Subject: [PATCH 19/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index dc64260..93dd057 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -5,7 +5,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 44%{?dist} +Release: 45%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -79,6 +79,9 @@ make install %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.04-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 2.04-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a936e48978fc7615971b6097a39cd6a266d64c78 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 24 Jan 2023 10:15:29 +0000 Subject: [PATCH 20/46] Rebuild OCaml packages for F38 --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 93dd057..2a9a393 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -5,7 +5,7 @@ Name: ocaml-calendar Version: 2.04 -Release: 45%{?dist} +Release: 46%{?dist} Summary: Objective Caml library for managing dates and times License: LGPLv2 @@ -79,6 +79,9 @@ make install %changelog +* Tue Jan 24 2023 Richard W.M. Jones - 2.04-46 +- Rebuild OCaml packages for F38 + * Thu Jan 19 2023 Fedora Release Engineering - 2.04-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 22e86b3341b5e274c8b565da79227d0c76c8f3ad Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 10 Jul 2023 17:21:37 -0600 Subject: [PATCH 21/46] Version 3.0.0 Other changes: - New project URLs - Convert License tag to SPDX - Drop obsolete debuginfo patch - Build with dune --- .gitignore | 1 + calendar-2.03.2-enable-debug.patch | 11 ----- ocaml-calendar.spec | 74 ++++++++++++------------------ sources | 2 +- 4 files changed, 32 insertions(+), 56 deletions(-) delete mode 100644 calendar-2.03.2-enable-debug.patch diff --git a/.gitignore b/.gitignore index b228034..ba78ab2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ calendar-2.01.1.tar.gz /calendar-2.03.1.tar.gz /calendar-2.03.2.tar.gz /calendar-2.04.tar.gz +/calendar-3.0.0.tar.gz diff --git a/calendar-2.03.2-enable-debug.patch b/calendar-2.03.2-enable-debug.patch deleted file mode 100644 index 6fc0d02..0000000 --- a/calendar-2.03.2-enable-debug.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- calendar-2.03.2/Makefile.in.old 2013-09-14 16:15:43.760253519 +0100 -+++ calendar-2.03.2/Makefile.in 2013-09-14 16:16:03.233279962 +0100 -@@ -86,7 +86,7 @@ - - CAMLIBS = $(addprefix -I , $(DIRS)) - --CAMLFLAGS= $(CAMLIBS) -+CAMLFLAGS= -g $(CAMLIBS) - BYTEFLAGS= $(CAMLFLAGS) - LINK_OPTFLAGS = $(CAMLFLAGS) -noassert - OPTFLAGS = $(LINK_OPTFLAGS) -for-pack CalendarLib diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 2a9a393..52b27c3 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -1,29 +1,20 @@ -%undefine _package_note_flags %ifnarch %{ocaml_native_compiler} %global debug_package %{nil} %endif Name: ocaml-calendar -Version: 2.04 -Release: 46%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: Objective Caml library for managing dates and times -License: LGPLv2 +License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception -URL: http://calendar.forge.ocamlcore.org/ -Source0: https://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz +URL: https://ocaml-community.github.io/calendar/ +Source0: https://github.com/ocaml-community/calendar/archive/v%{version}/calendar-%{version}.tar.gz -Patch1: calendar-2.03.2-enable-debug.patch - -BuildRequires: make -BuildRequires: ocaml >= 4.00.1 -BuildRequires: ocaml-findlib-devel >= 1.3.3-3 -BuildRequires: ocaml-ocamldoc -BuildRequires: gawk - -# Ignore all generated modules *except* CalendarLib, since everything -# now appears in that namespace. -%global __ocaml_requires_opts -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version -%global __ocaml_provides_opts -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version +BuildRequires: ocaml >= 4.03 +BuildRequires: ocaml-alcotest-devel +BuildRequires: ocaml-dune >= 1.0 +BuildRequires: ocaml-re-devel >= 1.7.2 %description @@ -32,7 +23,7 @@ Objective Caml library for managing dates and times. %package devel Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -41,44 +32,39 @@ developing applications that use %{name}. %prep -%setup -q -n calendar-%{version} -%patch1 -p1 +%autosetup -n calendar-%{version} -p1 %build -./configure --libdir=%{_libdir} -make -make doc - -mv TODO TODO.old -iconv -f iso-8859-1 -t utf-8 < TODO.old > TODO +%dune_build %install -export DESTDIR=$RPM_BUILD_ROOT -export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml -mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs -make install +%dune_install -%files -%doc CHANGES README TODO LGPL COPYING -%{_libdir}/ocaml/calendar -%ifarch %{ocaml_native_compiler} -%exclude %{_libdir}/ocaml/calendar/*.cmx -%endif -%exclude %{_libdir}/ocaml/calendar/*.mli +%check +%dune_check -%files devel -%doc CHANGES README TODO LGPL COPYING calendarFAQ-2.6.txt doc/* -%ifarch %{ocaml_native_compiler} -%{_libdir}/ocaml/calendar/*.cmx -%endif -%{_libdir}/ocaml/calendar/*.mli +%files -f .ofiles +%doc CHANGES README.md TODO +%license LGPL COPYING + + +%files devel -f .ofiles-devel +%doc CHANGES README.md TODO calendarFAQ-2.6.txt +%license LGPL COPYING %changelog +* Mon Jul 10 2023 Jerry James - 3.0.0-1 +- Version 3.0.0 +- New project URLs +- Convert License tag to SPDX +- Drop obsolete debuginfo patch +- Build with dune + * Tue Jan 24 2023 Richard W.M. Jones - 2.04-46 - Rebuild OCaml packages for F38 diff --git a/sources b/sources index ed73d34..6e5b9c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -625b4f32c9ff447501868fa1c44f4f4f calendar-2.04.tar.gz +SHA512 (calendar-3.0.0.tar.gz) = cf8a5cfbfb8879da7bcacf765d5461523cbc4f0c13133dfb2f311b051ed95b5f72815af5ca2836294a793d9b57bfc4cc1abbb8b54e17954cb4ecc99e1743bdc3 From d3c7c65fd15374c737c4e8c44f5440776b97fe70 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 11:36:23 +0100 Subject: [PATCH 22/46] ExcludeArch i686 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/) --- ocaml-calendar.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 52b27c3..1eea61e 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -1,3 +1,6 @@ +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} + %ifnarch %{ocaml_native_compiler} %global debug_package %{nil} %endif From 864c509d9acdc62b41c0f151fd82bdf96e1b5384 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 23:41:43 +0100 Subject: [PATCH 23/46] OCaml 5.0 rebuild for Fedora 39 --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 1eea61e..dc210d7 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Version: 3.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -61,6 +61,9 @@ developing applications that use %{name}. %changelog +* Tue Jul 11 2023 Richard W.M. Jones - 3.0.0-2 +- OCaml 5.0 rebuild for Fedora 39 + * Mon Jul 10 2023 Jerry James - 3.0.0-1 - Version 3.0.0 - New project URLs From b68b0c7ba810e7219ce132e4f2c3729c0cb7690d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 13 Jul 2023 19:23:08 -0400 Subject: [PATCH 24/46] Disable tests in RHEL builds ocaml-alcotest and its several dependencies are otherwise unneeded in RHEL and ELN. --- ocaml-calendar.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index dc210d7..74261c2 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -5,6 +5,15 @@ ExcludeArch: %{ix86} %global debug_package %{nil} %endif +# ocaml-alcotest requires ocaml-astring, ocaml-cmdliner, ocaml-fmt, and ocaml-uutf, +# none of which are otherwise needed for building the OCaml-depenedent packages +# found in RHEL and ELN. We want to avoid the extra dependencies there. +%if 0%{?rhel} +%bcond_with tests +%else +%bcond_without tests +%endif + Name: ocaml-calendar Version: 3.0.0 Release: 2%{?dist} @@ -15,10 +24,13 @@ URL: https://ocaml-community.github.io/calendar/ Source0: https://github.com/ocaml-community/calendar/archive/v%{version}/calendar-%{version}.tar.gz BuildRequires: ocaml >= 4.03 -BuildRequires: ocaml-alcotest-devel BuildRequires: ocaml-dune >= 1.0 BuildRequires: ocaml-re-devel >= 1.7.2 +%if %{with tests} +BuildRequires: ocaml-alcotest-devel +%endif + %description Objective Caml library for managing dates and times. @@ -46,8 +58,10 @@ developing applications that use %{name}. %dune_install +%if %{with tests} %check %dune_check +%endif %files -f .ofiles From c30763d3b5f84ae8553648f2e78ca83224170862 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 17:12:32 +0000 Subject: [PATCH 25/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 74261c2..3b678ec 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -16,7 +16,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Version: 3.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -75,6 +75,9 @@ developing applications that use %{name}. %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 3.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Richard W.M. Jones - 3.0.0-2 - OCaml 5.0 rebuild for Fedora 39 From 6a7e8de275f53f9ac3bc65ec563f3926aa4b9002 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Oct 2023 15:38:33 +0100 Subject: [PATCH 26/46] OCaml 5.1 rebuild for Fedora 40 --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 3b678ec..c71934b 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -16,7 +16,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Version: 3.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -75,6 +75,9 @@ developing applications that use %{name}. %changelog +* Thu Oct 05 2023 Richard W.M. Jones - 3.0.0-4 +- OCaml 5.1 rebuild for Fedora 40 + * Thu Jul 20 2023 Fedora Release Engineering - 3.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From c63aeb4a5ffd2dce2a0a93da3061e6ca7343cbfb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Dec 2023 14:53:20 +0000 Subject: [PATCH 27/46] OCaml 5.1.1 rebuild for Fedora 40 --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index c71934b..273cccd 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -16,7 +16,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Version: 3.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -75,6 +75,9 @@ developing applications that use %{name}. %changelog +* Tue Dec 12 2023 Richard W.M. Jones - 3.0.0-5 +- OCaml 5.1.1 rebuild for Fedora 40 + * Thu Oct 05 2023 Richard W.M. Jones - 3.0.0-4 - OCaml 5.1 rebuild for Fedora 40 From c5c2851f13c97a16418466eb9e20855f0872f4b0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Dec 2023 14:35:29 +0000 Subject: [PATCH 28/46] OCaml 5.1.1 + s390x code gen fix for Fedora 40 --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 273cccd..19ea8fe 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -16,7 +16,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Version: 3.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -75,6 +75,9 @@ developing applications that use %{name}. %changelog +* Mon Dec 18 2023 Richard W.M. Jones - 3.0.0-6 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + * Tue Dec 12 2023 Richard W.M. Jones - 3.0.0-5 - OCaml 5.1.1 rebuild for Fedora 40 From 877a79572830428760c8d0022d3eed55d06f97c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 10:11:42 +0000 Subject: [PATCH 29/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 19ea8fe..31b1d6a 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -16,7 +16,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Version: 3.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -75,6 +75,9 @@ developing applications that use %{name}. %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 3.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 18 2023 Richard W.M. Jones - 3.0.0-6 - OCaml 5.1.1 + s390x code gen fix for Fedora 40 From cbbff9ed003ce8527d2d5caee5ef343c59282913 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 09:51:05 +0000 Subject: [PATCH 30/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 31b1d6a..cd4297d 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -16,7 +16,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Version: 3.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -75,6 +75,9 @@ developing applications that use %{name}. %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 3.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 3.0.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 57f62de477f0f43d7245de59dc12cea8af146ffc Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 23 May 2024 11:27:39 -0600 Subject: [PATCH 31/46] Simplify with %bcond - Add VCS field --- ocaml-calendar.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index cd4297d..c539496 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -6,13 +6,9 @@ ExcludeArch: %{ix86} %endif # ocaml-alcotest requires ocaml-astring, ocaml-cmdliner, ocaml-fmt, and ocaml-uutf, -# none of which are otherwise needed for building the OCaml-depenedent packages +# none of which are otherwise needed for building the OCaml-dependent packages # found in RHEL and ELN. We want to avoid the extra dependencies there. -%if 0%{?rhel} -%bcond_with tests -%else -%bcond_without tests -%endif +%bcond tests %[!0%{?rhel}] Name: ocaml-calendar Version: 3.0.0 @@ -21,7 +17,8 @@ Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception URL: https://ocaml-community.github.io/calendar/ -Source0: https://github.com/ocaml-community/calendar/archive/v%{version}/calendar-%{version}.tar.gz +VCS: https://github.com/ocaml-community/calendar +Source0: %{vcs}/archive/v%{version}/calendar-%{version}.tar.gz BuildRequires: ocaml >= 4.03 BuildRequires: ocaml-dune >= 1.0 @@ -75,6 +72,10 @@ developing applications that use %{name}. %changelog +* Thu May 23 2024 Jerry James - 3.0.0-8 +- Simplify with %%bcond +- Add VCS field + * Thu Jan 25 2024 Fedora Release Engineering - 3.0.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f165f24025641f9b75b28be81d26e420ca8f5fb5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 30 May 2024 08:53:45 +0100 Subject: [PATCH 32/46] OCaml 5.2.0 for Fedora 41 --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index c539496..5b584b8 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -12,7 +12,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Version: 3.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -72,6 +72,9 @@ developing applications that use %{name}. %changelog +* Thu May 30 2024 Richard W.M. Jones - 3.0.0-9 +- OCaml 5.2.0 for Fedora 41 + * Thu May 23 2024 Jerry James - 3.0.0-8 - Simplify with %%bcond - Add VCS field From a0a1bb9a6784c57a2aefae63121d82417a5b3b57 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 31 May 2024 16:58:23 +0100 Subject: [PATCH 33/46] Remove BR ocaml-re, apparently not necessary. --- ocaml-calendar.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 5b584b8..323674d 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -12,7 +12,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Version: 3.0.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -22,7 +22,6 @@ Source0: %{vcs}/archive/v%{version}/calendar-%{version}.tar.gz BuildRequires: ocaml >= 4.03 BuildRequires: ocaml-dune >= 1.0 -BuildRequires: ocaml-re-devel >= 1.7.2 %if %{with tests} BuildRequires: ocaml-alcotest-devel @@ -72,6 +71,9 @@ developing applications that use %{name}. %changelog +* Fri May 31 2024 Richard W.M. Jones - 3.0.0-10 +- Remove BR ocaml-re, apparently not necessary. + * Thu May 30 2024 Richard W.M. Jones - 3.0.0-9 - OCaml 5.2.0 for Fedora 41 From 5a90b4e881b7dd357bb39c9385ad9c0a30e0b6f2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 31 May 2024 17:17:31 +0100 Subject: [PATCH 34/46] Revert "Remove BR ocaml-re, apparently not necessary." This was incorrect. ocaml-re is necessary (see src/dune). As it is pulled in implicitly the build still appeared to work without the BR. This reverts commit a0a1bb9a6784c57a2aefae63121d82417a5b3b57. --- ocaml-calendar.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 323674d..d5691fd 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -12,7 +12,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Version: 3.0.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -22,6 +22,7 @@ Source0: %{vcs}/archive/v%{version}/calendar-%{version}.tar.gz BuildRequires: ocaml >= 4.03 BuildRequires: ocaml-dune >= 1.0 +BuildRequires: ocaml-re-devel >= 1.7.2 %if %{with tests} BuildRequires: ocaml-alcotest-devel @@ -71,10 +72,7 @@ developing applications that use %{name}. %changelog -* Fri May 31 2024 Richard W.M. Jones - 3.0.0-10 -- Remove BR ocaml-re, apparently not necessary. - -* Thu May 30 2024 Richard W.M. Jones - 3.0.0-9 +* Thu May 30 2024 Richard W.M. Jones - 3.0.0-11 - OCaml 5.2.0 for Fedora 41 * Thu May 23 2024 Jerry James - 3.0.0-8 From 024d922bfad46166f7d0418b8b11db09a4d6f728 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 08:28:05 +0100 Subject: [PATCH 35/46] Bump Epoch to 1 to match RHEL 10 See: https://gitlab.com/redhat/centos-stream/rpms/ocaml-calendar/-/commit/92adf4cf1d71b225a6994d827eea117d86ea6dc0 --- ocaml-calendar.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index d5691fd..d96f37b 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -11,6 +11,7 @@ ExcludeArch: %{ix86} %bcond tests %[!0%{?rhel}] Name: ocaml-calendar +Epoch: 1 Version: 3.0.0 Release: 11%{?dist} Summary: Objective Caml library for managing dates and times @@ -35,7 +36,7 @@ Objective Caml library for managing dates and times. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel From e00b4bbeaa7fe421331f0e52cdc6a10039f7c7b6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 08:39:08 +0100 Subject: [PATCH 36/46] Add RHEL gating test --- gating.yaml | 6 ++++++ tests/basic-test.sh | 8 ++++++++ tests/tests.yml | 13 +++++++++++++ 3 files changed, 27 insertions(+) create mode 100755 gating.yaml create mode 100755 tests/basic-test.sh create mode 100755 tests/tests.yml diff --git a/gating.yaml b/gating.yaml new file mode 100755 index 0000000..2c7ed80 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/tests/basic-test.sh b/tests/basic-test.sh new file mode 100755 index 0000000..3ebee39 --- /dev/null +++ b/tests/basic-test.sh @@ -0,0 +1,8 @@ +#!/bin/bash - +set -e +set -x + +# Compile trivial calendar program. +echo 'CalendarLib.Calendar.Period.make 0 0 0 1 0 0' > caltest.ml +ocamlfind ocamlopt -package calendar caltest.ml -linkpkg -o caltest +./caltest diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100755 index 0000000..a652627 --- /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-calendar-devel + tests: + - simple: + dir: . + run: ./basic-test.sh From 70cfb51a8c22c808b262a8e769d5f266b94be362 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 14:25:09 +0100 Subject: [PATCH 37/46] OCaml 5.2.0 ppc64le fix --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index d96f37b..5e2c260 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -13,7 +13,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Epoch: 1 Version: 3.0.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -73,6 +73,9 @@ developing applications that use %{name}. %changelog +* Wed Jun 19 2024 Richard W.M. Jones - 1:3.0.0-12 +- OCaml 5.2.0 ppc64le fix + * Thu May 30 2024 Richard W.M. Jones - 3.0.0-11 - OCaml 5.2.0 for Fedora 41 From 76dd5de15905c9dd43fd40da03cb97a966a669bd Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Jul 2024 13:44:59 -0600 Subject: [PATCH 38/46] Fix the VCS field --- ocaml-calendar.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 5e2c260..6088cf4 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -10,6 +10,8 @@ ExcludeArch: %{ix86} # found in RHEL and ELN. We want to avoid the extra dependencies there. %bcond tests %[!0%{?rhel}] +%global giturl https://github.com/ocaml-community/calendar + Name: ocaml-calendar Epoch: 1 Version: 3.0.0 @@ -18,8 +20,8 @@ Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception URL: https://ocaml-community.github.io/calendar/ -VCS: https://github.com/ocaml-community/calendar -Source0: %{vcs}/archive/v%{version}/calendar-%{version}.tar.gz +VCS: git:%{giturl}.git +Source0: %{giturl}/archive/v%{version}/calendar-%{version}.tar.gz BuildRequires: ocaml >= 4.03 BuildRequires: ocaml-dune >= 1.0 From 93e8ebb6ae754c719e68c478fffe299a7a1a1ad8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:01:57 +0000 Subject: [PATCH 39/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 6088cf4..3e5fd90 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -15,7 +15,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Epoch: 1 Version: 3.0.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -75,6 +75,9 @@ developing applications that use %{name}. %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1:3.0.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 19 2024 Richard W.M. Jones - 1:3.0.0-12 - OCaml 5.2.0 ppc64le fix From 5e7be62153f4e2d0e99cba7e43c37c248d016335 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 3 Oct 2024 11:14:21 +0100 Subject: [PATCH 40/46] Rebuild against ocaml-re 1.13.3 (RHBZ#2316105) --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 3e5fd90..f80bda3 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -15,7 +15,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Epoch: 1 Version: 3.0.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -75,6 +75,9 @@ developing applications that use %{name}. %changelog +* Thu Oct 03 2024 Richard W.M. Jones - 1:3.0.0-14 +- Rebuild against ocaml-re 1.13.3 (RHBZ#2316105) + * Thu Jul 18 2024 Fedora Release Engineering - 1:3.0.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 76805c3b26b2159807059b0afa674eba801e06e2 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 9 Jan 2025 17:26:28 -0700 Subject: [PATCH 41/46] OCaml 5.3.0 rebuild for Fedora 42 - Add patch for a test failure --- ocaml-calendar-timezone-test.patch | 33 ++++++++++++++++++++++++++++++ ocaml-calendar.spec | 8 +++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 ocaml-calendar-timezone-test.patch diff --git a/ocaml-calendar-timezone-test.patch b/ocaml-calendar-timezone-test.patch new file mode 100644 index 0000000..ca92b25 --- /dev/null +++ b/ocaml-calendar-timezone-test.patch @@ -0,0 +1,33 @@ +When the tests are executed in Mountain Standard Time, the timezone test fails: + +ASSERT gap g6 Local = gap g6 UTC + gap UTC Local +File "tests/test_timezone.ml", line 37, character 2: +FAIL gap g6 Local = gap g6 UTC + gap UTC Local + + Expected: `11' + Received: `-13' + +--- calendar-3.0.0/tests/test_timezone.ml.orig 2022-10-11 09:39:06.000000000 -0600 ++++ calendar-3.0.0/tests/test_timezone.ml 2024-12-13 11:20:28.349298798 -0700 +@@ -27,6 +27,12 @@ open Time_Zone;; + + let tz = Alcotest.testable (Fmt.always "timezone") (=) ;; + ++let make_in_bounds x = ++ let y = x mod 24 in ++ if y < -12 then y + 24 ++ else if y > 11 then y - 24 ++ else y ++ + let test () = + change UTC; + Alcotest.(check tz) "current () = UTC" UTC (current ()); +@@ -36,7 +42,7 @@ let test () = + let g6 = UTC_Plus 6 in + Alcotest.(check int) + "gap g6 Local = gap g6 UTC + gap UTC Local" +- (gap g6 Local) (gap g6 UTC + gap UTC Local); ++ (gap g6 Local) (make_in_bounds (gap g6 UTC + gap UTC Local)); + Gen_test.test_exn (lazy (change (UTC_Plus 13))) "change 13"; + Gen_test.test_exn (lazy (change (UTC_Plus (-15)))) "change (-15)"; + change (UTC_Plus 4); diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index f80bda3..9f1618e 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -15,13 +15,15 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Epoch: 1 Version: 3.0.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception URL: https://ocaml-community.github.io/calendar/ VCS: git:%{giturl}.git Source0: %{giturl}/archive/v%{version}/calendar-%{version}.tar.gz +# Work around https://github.com/ocaml-community/calendar/issues/43 +Patch: %{name}-timezone-test.patch BuildRequires: ocaml >= 4.03 BuildRequires: ocaml-dune >= 1.0 @@ -75,6 +77,10 @@ developing applications that use %{name}. %changelog +* Fri Jan 10 2025 Jerry James - 1:3.0.0-15 +- OCaml 5.3.0 rebuild for Fedora 42 +- Add patch for a test failure + * Thu Oct 03 2024 Richard W.M. Jones - 1:3.0.0-14 - Rebuild against ocaml-re 1.13.3 (RHBZ#2316105) From f3fb1b87c19dd6d4c6cd442fc2668056ceaa4181 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 20:43:44 +0000 Subject: [PATCH 42/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 9f1618e..3c48200 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -15,7 +15,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Epoch: 1 Version: 3.0.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -77,6 +77,9 @@ developing applications that use %{name}. %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1:3.0.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jan 10 2025 Jerry James - 1:3.0.0-15 - OCaml 5.3.0 rebuild for Fedora 42 - Add patch for a test failure From efff9ad2178cfc09e48f5e34bbff090103a00ce8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 12 Jul 2025 09:34:16 -0600 Subject: [PATCH 43/46] Rebuild to fix OCaml dependencies --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 3c48200..15f9fd6 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -15,7 +15,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Epoch: 1 Version: 3.0.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -77,6 +77,9 @@ developing applications that use %{name}. %changelog +* Sat Jul 12 2025 Jerry James - 1:3.0.0-17 +- Rebuild to fix OCaml dependencies + * Fri Jan 17 2025 Fedora Release Engineering - 1:3.0.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7f8bd27d2e7e7b771c8c322503cd3ae62a3d3096 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:08:09 +0000 Subject: [PATCH 44/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 15f9fd6..cd6921e 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -15,7 +15,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Epoch: 1 Version: 3.0.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -77,6 +77,9 @@ developing applications that use %{name}. %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1:3.0.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jul 12 2025 Jerry James - 1:3.0.0-17 - Rebuild to fix OCaml dependencies From b429b74638bc7c345fde4b04f5676ed5bccc92a9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Oct 2025 21:38:33 +0100 Subject: [PATCH 45/46] OCaml 5.4.0 rebuild --- ocaml-calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index cd6921e..4da82bf 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -15,7 +15,7 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Epoch: 1 Version: 3.0.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -77,6 +77,9 @@ developing applications that use %{name}. %changelog +* Mon Oct 13 2025 Richard W.M. Jones - 1:3.0.0-19 +- OCaml 5.4.0 rebuild + * Thu Jul 24 2025 Fedora Release Engineering - 1:3.0.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 43c2e4c970f5f954d2c9dc021acc3f18fb0f370a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 13 Jan 2026 16:07:40 -0700 Subject: [PATCH 46/46] Fix a changelog entry --- ocaml-calendar.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 4da82bf..41b5b2c 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -83,7 +83,7 @@ developing applications that use %{name}. * Thu Jul 24 2025 Fedora Release Engineering - 1:3.0.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Sat Jul 12 2025 Jerry James - 1:3.0.0-17 +* Sat Jul 12 2025 Jerry James - 1:3.0.0-17 - Rebuild to fix OCaml dependencies * Fri Jan 17 2025 Fedora Release Engineering - 1:3.0.0-16