From 26e1fe9f861de23a4105c779325718f5da9885c9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 9 Jan 2025 20:43:03 -0700 Subject: [PATCH 1/7] OCaml 5.3.0 rebuild for Fedora 42 - Version 0.6.6 - All patches have been upstreamed --- .gitignore | 1 + ocaml-fileutils-0.6.4-cmp.patch | 18 --------------- ocaml-fileutils-0.6.4-forward-compat.patch | 27 ---------------------- ocaml-fileutils.spec | 21 ++++++++--------- sources | 2 +- 5 files changed, 12 insertions(+), 57 deletions(-) delete mode 100644 ocaml-fileutils-0.6.4-cmp.patch delete mode 100644 ocaml-fileutils-0.6.4-forward-compat.patch diff --git a/.gitignore b/.gitignore index 001651e..8fe9270 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ ocaml-fileutils-0.4.0.tar.gz /ocaml-fileutils-0.5.1.tar.gz /ocaml-fileutils-0.5.2.tar.gz /fileutils-0.6.4.tbz +/fileutils-0.6.6.tbz diff --git a/ocaml-fileutils-0.6.4-cmp.patch b/ocaml-fileutils-0.6.4-cmp.patch deleted file mode 100644 index a966e28..0000000 --- a/ocaml-fileutils-0.6.4-cmp.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- fileutils-0.6.4/src/lib/fileutils/FileUtilCMP.ml.orig 2022-10-28 14:22:35.000000000 -0600 -+++ fileutils-0.6.4/src/lib/fileutils/FileUtilCMP.ml 2023-06-22 15:04:21.317130686 -0600 -@@ -48,11 +48,14 @@ let cmp ?(skip1 = 0) fln1 ?(skip2 = 0) f - let rec loop count s1 s2 = - match s1, s2 with - | Seq.Cons (v1, s1), Seq.Cons (v2, s2) when v1 = v2 -> loop (count + 1) (s1 ()) (s2 ()) -+ | Seq.Nil, Seq.Nil -> (-1) - | _ -> count - in - let count = loop 0 (stream1 ()) (stream2 ()) in - clean_fd (); -- Some count -+ match count with -+ | (-1) -> None -+ | x -> Some x - end else - Some (-1) - diff --git a/ocaml-fileutils-0.6.4-forward-compat.patch b/ocaml-fileutils-0.6.4-forward-compat.patch deleted file mode 100644 index 2b1e084..0000000 --- a/ocaml-fileutils-0.6.4-forward-compat.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- fileutils-0.6.4/fileutils.opam.orig 2022-10-28 14:22:35.000000000 -0600 -+++ fileutils-0.6.4/fileutils.opam 2023-06-22 13:01:26.779533940 -0600 -@@ -16,8 +16,6 @@ build: [ - depends: [ - "ocaml" {>= "4.03"} - "base-unix" -- "stdlib-shims" -- "seq" - "dune" {>= "1.11.0"} - "ounit2" {with-test & >= "2.0.0"} - ] ---- fileutils-0.6.4/src/lib/fileutils/dune.orig 2022-10-28 14:22:35.000000000 -0600 -+++ fileutils-0.6.4/src/lib/fileutils/dune 2023-06-22 13:01:47.403222843 -0600 -@@ -30,4 +30,4 @@ - fileUtilWHICH - unixPath - win32Path) -- (libraries unix seq stdlib-shims)) -+ (libraries unix)) ---- fileutils-0.6.4/test/dune.orig 2022-10-28 14:22:35.000000000 -0600 -+++ fileutils-0.6.4/test/dune 2023-06-22 13:02:04.739961336 -0600 -@@ -6,4 +6,4 @@ - (test - (name test) - (modules test) -- (libraries fileutils fileutils_str ounit2 stdlib-shims)) -+ (libraries fileutils fileutils_str ounit2)) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 3325797..738ce82 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -8,24 +8,18 @@ ExcludeArch: %{ix86} %global giturl https://github.com/gildor478/ocaml-fileutils Name: ocaml-fileutils -Version: 0.6.4 -Release: 11%{?dist} +Version: 0.6.6 +Release: 1%{?dist} Summary: OCaml library for common file and filename operations License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception URL: https://gildor478.github.io/ocaml-fileutils/ VCS: git:%{giturl}.git Source0: %{giturl}/releases/download/v%{version}/fileutils-%{version}.tbz -# Fedora does not need the stdlib-shims or seq forward compatibility packages -Patch0: ocaml-fileutils-0.6.4-forward-compat.patch -# Given two distinct files with identical contents, the cmp function evaluates -# to "Some x", where x is the size of each file, instead of None. This breaks -# the ocaml-gettext tests, which expect None in that case. -Patch1: ocaml-fileutils-0.6.4-cmp.patch -BuildRequires: ocaml >= 4.03.0 -BuildRequires: ocaml-dune >= 1.11.0 -%if 0%{?fedora} || 0%{?rhel} <= 6 +BuildRequires: ocaml >= 4.14 +BuildRequires: ocaml-dune >= 2.9 +%if 0%{?fedora} BuildRequires: ocaml-ounit-devel >= 2.0.0 %endif @@ -80,6 +74,11 @@ developing applications that use %{name}. %changelog +* Thu Jan 9 2025 Jerry James - 0.6.6-1 +- OCaml 5.3.0 rebuild for Fedora 42 +- Version 0.6.6 +- All patches have been upstreamed + * Thu Jul 18 2024 Fedora Release Engineering - 0.6.4-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 565179f..ee75ed3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fileutils-0.6.4.tbz) = 7053f8d92655d5631f1ec61ab7f9e3f6e3afedbe435038858dd9a026b9c769c6182afaa436491a398e7c4513b384a609e016718e030855996b2d9d54b461bd19 +SHA512 (fileutils-0.6.6.tbz) = ecc38b1577ab108bd24d1e9f0e83596254e542eefb37020dedcff7ca0109e562411cbb9806fbc6f88f4166569bf061a444971388c26950ec02dfc48b35daed90 From 3db60a3d606c7d63e69f9ef7c59c5a2d9f9b9faa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 20:49:28 +0000 Subject: [PATCH 2/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 738ce82..387ae8a 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -9,7 +9,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for common file and filename operations License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -74,6 +74,9 @@ developing applications that use %{name}. %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 9 2025 Jerry James - 0.6.6-1 - OCaml 5.3.0 rebuild for Fedora 42 - Version 0.6.6 From 2a78e73639ba9e234fe50696d83c4aa9362bbd09 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 29 Jan 2025 13:21:57 -0700 Subject: [PATCH 3/7] OCaml 5.2.1 rebuild for Fedora 41 - Version 0.6.6 - All patches have been upstreamed --- .gitignore | 1 + ocaml-fileutils-0.6.4-cmp.patch | 18 --------------- ocaml-fileutils-0.6.4-forward-compat.patch | 27 ---------------------- ocaml-fileutils.spec | 22 ++++++++---------- sources | 2 +- 5 files changed, 12 insertions(+), 58 deletions(-) delete mode 100644 ocaml-fileutils-0.6.4-cmp.patch delete mode 100644 ocaml-fileutils-0.6.4-forward-compat.patch diff --git a/.gitignore b/.gitignore index 001651e..8fe9270 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ ocaml-fileutils-0.4.0.tar.gz /ocaml-fileutils-0.5.1.tar.gz /ocaml-fileutils-0.5.2.tar.gz /fileutils-0.6.4.tbz +/fileutils-0.6.6.tbz diff --git a/ocaml-fileutils-0.6.4-cmp.patch b/ocaml-fileutils-0.6.4-cmp.patch deleted file mode 100644 index a966e28..0000000 --- a/ocaml-fileutils-0.6.4-cmp.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- fileutils-0.6.4/src/lib/fileutils/FileUtilCMP.ml.orig 2022-10-28 14:22:35.000000000 -0600 -+++ fileutils-0.6.4/src/lib/fileutils/FileUtilCMP.ml 2023-06-22 15:04:21.317130686 -0600 -@@ -48,11 +48,14 @@ let cmp ?(skip1 = 0) fln1 ?(skip2 = 0) f - let rec loop count s1 s2 = - match s1, s2 with - | Seq.Cons (v1, s1), Seq.Cons (v2, s2) when v1 = v2 -> loop (count + 1) (s1 ()) (s2 ()) -+ | Seq.Nil, Seq.Nil -> (-1) - | _ -> count - in - let count = loop 0 (stream1 ()) (stream2 ()) in - clean_fd (); -- Some count -+ match count with -+ | (-1) -> None -+ | x -> Some x - end else - Some (-1) - diff --git a/ocaml-fileutils-0.6.4-forward-compat.patch b/ocaml-fileutils-0.6.4-forward-compat.patch deleted file mode 100644 index 2b1e084..0000000 --- a/ocaml-fileutils-0.6.4-forward-compat.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- fileutils-0.6.4/fileutils.opam.orig 2022-10-28 14:22:35.000000000 -0600 -+++ fileutils-0.6.4/fileutils.opam 2023-06-22 13:01:26.779533940 -0600 -@@ -16,8 +16,6 @@ build: [ - depends: [ - "ocaml" {>= "4.03"} - "base-unix" -- "stdlib-shims" -- "seq" - "dune" {>= "1.11.0"} - "ounit2" {with-test & >= "2.0.0"} - ] ---- fileutils-0.6.4/src/lib/fileutils/dune.orig 2022-10-28 14:22:35.000000000 -0600 -+++ fileutils-0.6.4/src/lib/fileutils/dune 2023-06-22 13:01:47.403222843 -0600 -@@ -30,4 +30,4 @@ - fileUtilWHICH - unixPath - win32Path) -- (libraries unix seq stdlib-shims)) -+ (libraries unix)) ---- fileutils-0.6.4/test/dune.orig 2022-10-28 14:22:35.000000000 -0600 -+++ fileutils-0.6.4/test/dune 2023-06-22 13:02:04.739961336 -0600 -@@ -6,4 +6,4 @@ - (test - (name test) - (modules test) -- (libraries fileutils fileutils_str ounit2 stdlib-shims)) -+ (libraries fileutils fileutils_str ounit2)) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 3325797..8ebd1e1 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -8,24 +8,17 @@ ExcludeArch: %{ix86} %global giturl https://github.com/gildor478/ocaml-fileutils Name: ocaml-fileutils -Version: 0.6.4 -Release: 11%{?dist} +Version: 0.6.6 +Release: 1%{?dist} Summary: OCaml library for common file and filename operations License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception URL: https://gildor478.github.io/ocaml-fileutils/ VCS: git:%{giturl}.git Source0: %{giturl}/releases/download/v%{version}/fileutils-%{version}.tbz -# Fedora does not need the stdlib-shims or seq forward compatibility packages -Patch0: ocaml-fileutils-0.6.4-forward-compat.patch -# Given two distinct files with identical contents, the cmp function evaluates -# to "Some x", where x is the size of each file, instead of None. This breaks -# the ocaml-gettext tests, which expect None in that case. -Patch1: ocaml-fileutils-0.6.4-cmp.patch - -BuildRequires: ocaml >= 4.03.0 -BuildRequires: ocaml-dune >= 1.11.0 -%if 0%{?fedora} || 0%{?rhel} <= 6 +BuildRequires: ocaml >= 4.14 +BuildRequires: ocaml-dune >= 2.9 +%if 0%{?fedora} BuildRequires: ocaml-ounit-devel >= 2.0.0 %endif @@ -80,6 +73,11 @@ developing applications that use %{name}. %changelog +* Wed Jan 29 2025 Jerry James - 0.6.6-1 +- OCaml 5.2.1 rebuild for Fedora 41 +- Version 0.6.6 +- All patches have been upstreamed + * Thu Jul 18 2024 Fedora Release Engineering - 0.6.4-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 565179f..ee75ed3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fileutils-0.6.4.tbz) = 7053f8d92655d5631f1ec61ab7f9e3f6e3afedbe435038858dd9a026b9c769c6182afaa436491a398e7c4513b384a609e016718e030855996b2d9d54b461bd19 +SHA512 (fileutils-0.6.6.tbz) = ecc38b1577ab108bd24d1e9f0e83596254e542eefb37020dedcff7ca0109e562411cbb9806fbc6f88f4166569bf061a444971388c26950ec02dfc48b35daed90 From 1b68af0abb9976ddd2d9e546df6f915742a93d74 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 12 Jul 2025 13:11:17 -0600 Subject: [PATCH 4/7] Rebuild to fix OCaml dependencies --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 387ae8a..95f190c 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -9,7 +9,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for common file and filename operations License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -74,6 +74,9 @@ developing applications that use %{name}. %changelog +* Sat Jul 12 2025 Jerry James - 0.6.6-3 +- Rebuild to fix OCaml dependencies + * Fri Jan 17 2025 Fedora Release Engineering - 0.6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 09b1b038dda43d6d07e7a1466b4798571d0c44cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:10:48 +0000 Subject: [PATCH 5/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 95f190c..08a4e4e 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -9,7 +9,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OCaml library for common file and filename operations License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -74,6 +74,9 @@ developing applications that use %{name}. %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.6.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jul 12 2025 Jerry James - 0.6.6-3 - Rebuild to fix OCaml dependencies From a347812ca32af28ef03c09ead8defbd477e01135 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 14 Oct 2025 09:06:13 +0100 Subject: [PATCH 6/7] OCaml 5.4.0 rebuild --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 08a4e4e..5c9e35b 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -9,7 +9,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: OCaml library for common file and filename operations License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -74,6 +74,9 @@ developing applications that use %{name}. %changelog +* Tue Oct 14 2025 Richard W.M. Jones - 0.6.6-5 +- OCaml 5.4.0 rebuild + * Thu Jul 24 2025 Fedora Release Engineering - 0.6.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ed6c50508fff9aeec04232d347c038864c98a5bb Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 13 Jan 2026 16:24:10 -0700 Subject: [PATCH 7/7] Fix a changelog entry --- ocaml-fileutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 5c9e35b..a664cef 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -80,7 +80,7 @@ developing applications that use %{name}. * Thu Jul 24 2025 Fedora Release Engineering - 0.6.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Sat Jul 12 2025 Jerry James - 0.6.6-3 +* Sat Jul 12 2025 Jerry James - 0.6.6-3 - Rebuild to fix OCaml dependencies * Fri Jan 17 2025 Fedora Release Engineering - 0.6.6-2