From 3bb953ce848d96846a34a07a371fc19d17d8240a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 8 Nov 2017 17:00:31 +0000 Subject: [PATCH 01/62] OCaml 4.06.0 rebuild. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 3686b55..156503c 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -5,7 +5,7 @@ Name: ocaml-fileutils Version: 0.5.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Wed Nov 08 2017 Richard W.M. Jones - 0.5.1-9 +- OCaml 4.06.0 rebuild. + * Mon Aug 07 2017 Richard W.M. Jones - 0.5.1-8 - OCaml 4.05.0 rebuild. From a9e8600c632dad4490ed5b46d443acef02856897 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 8 Nov 2017 17:24:31 +0000 Subject: [PATCH 02/62] New upstream version 0.5.2. OCaml 4.06.0 rebuild. --- .gitignore | 1 + ocaml-fileutils.spec | 18 +++++++----------- sources | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index ea02671..384150d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ ocaml-fileutils-0.4.0.tar.gz /ocaml-fileutils-0.4.4.tar.gz /ocaml-fileutils-0.4.5.tar.gz /ocaml-fileutils-0.5.1.tar.gz +/ocaml-fileutils-0.5.2.tar.gz diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 156503c..9862385 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,16 +1,11 @@ -%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) -%if ! %opt -%global debug_package %{nil} -%endif - Name: ocaml-fileutils -Version: 0.5.1 -Release: 9%{?dist} +Version: 0.5.2 +Release: 1%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions URL: https://forge.ocamlcore.org/projects/ocaml-fileutils/ -Source0: http://forge.ocamlcore.org/frs/download.php/1651/ocaml-fileutils-0.5.1.tar.gz +Source0: http://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.tar.gz BuildRequires: ocaml >= 4.00.1 BuildRequires: ocaml-findlib-devel >= 1.3.3-3 @@ -74,7 +69,7 @@ make test %files %doc COPYING.txt %{_libdir}/ocaml/fileutils -%if %opt +%ifarch %{ocaml_native_compiler} %exclude %{_libdir}/ocaml/fileutils/*.a %exclude %{_libdir}/ocaml/fileutils/*.cmx %exclude %{_libdir}/ocaml/fileutils/*.cmxa @@ -85,7 +80,7 @@ make test %files devel %doc COPYING.txt AUTHORS.txt CHANGELOG.txt README.txt TODO.txt -%if %opt +%ifarch %{ocaml_native_compiler} %{_libdir}/ocaml/fileutils/*.a %{_libdir}/ocaml/fileutils/*.cmx %{_libdir}/ocaml/fileutils/*.cmxa @@ -95,7 +90,8 @@ make test %changelog -* Wed Nov 08 2017 Richard W.M. Jones - 0.5.1-9 +* Wed Nov 08 2017 Richard W.M. Jones - 0.5.2-1 +- New upstream version 0.5.2. - OCaml 4.06.0 rebuild. * Mon Aug 07 2017 Richard W.M. Jones - 0.5.1-8 diff --git a/sources b/sources index a36731d..23e4068 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2fe185bbce4357eb5fba1dfc0b3e63c5 ocaml-fileutils-0.5.1.tar.gz +SHA512 (ocaml-fileutils-0.5.2.tar.gz) = 264282c54ff693686ca9e60f371038f8ea9bce219d04556297dc7b6028c9f65c5a03b7cd263c3519cb212e29665200db1c95c88874bb2cb3d7b610e3b832018d From 1f1fd1287458935718df9f14bde55de963eaf276 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 8 Nov 2017 17:38:59 +0000 Subject: [PATCH 03/62] Fixes for version 0.5.2. --- fileutils-0.5.2-fix-bytes.patch | 20 ++++++++++++++++++++ ocaml-fileutils.spec | 19 ++++++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 fileutils-0.5.2-fix-bytes.patch diff --git a/fileutils-0.5.2-fix-bytes.patch b/fileutils-0.5.2-fix-bytes.patch new file mode 100644 index 0000000..cd0011d --- /dev/null +++ b/fileutils-0.5.2-fix-bytes.patch @@ -0,0 +1,20 @@ +--- ocaml-fileutils-0.5.2.old/src/FileUtilCP.ml 2017-05-23 21:12:19.000000000 +0100 ++++ ocaml-fileutils-0.5.2/src/FileUtilCP.ml 2017-11-08 17:36:42.271524209 +0000 +@@ -138,7 +138,7 @@ + end + in + +- let buffer = String.make 1024 ' ' in ++ let buffer = Bytes.make 1024 ' ' in + + let cp_file st_src dst_exists fn_src fn_dst = + let mode = int_of_permission st_src.permission in +@@ -176,7 +176,7 @@ + try + while (read := + handle_exception +- (Unix.read fd_src buffer 0) (String.length buffer) ++ (Unix.read fd_src buffer 0) (Bytes.length buffer) + (fun e -> `ErrorRead(fn_src, e)); + !read <> 0) do + let written = diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 9862385..1669dde 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -7,6 +7,8 @@ License: LGPLv2 with exceptions URL: https://forge.ocamlcore.org/projects/ocaml-fileutils/ Source0: http://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.tar.gz +Patch1: fileutils-0.5.2-fix-bytes.patch + BuildRequires: ocaml >= 4.00.1 BuildRequires: ocaml-findlib-devel >= 1.3.3-3 BuildRequires: ocaml-ocamldoc @@ -39,16 +41,17 @@ developing applications that use %{name}. %prep %setup -q - -# Disable the tests (RHEL 7 only) since they require ocaml-ounit. -%if 0%{?rhel} >= 7 -rm test/test.ml -touch test/test.ml -%endif +%autopatch -p1 %build -ocaml setup.ml -configure --prefix %{_prefix} --destdir $RPM_BUILD_ROOT +# Disable the tests (RHEL 7 only) since they require ocaml-ounit. +ocaml setup.ml -configure --prefix %{_prefix} --destdir $RPM_BUILD_ROOT \ +%if 0%{?rhel} >= 7 + --disable-tests +%else + --enable-tests +%endif make @@ -63,7 +66,9 @@ make htmldir=. install %check +%if ! 0%{?rhel} >= 7 make test +%endif %files From a256cca3db6c7e85ff0fc20688a6410813addb0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 08:50:08 +0000 Subject: [PATCH 04/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 1669dde..799a1a6 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 0.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Nov 08 2017 Richard W.M. Jones - 0.5.2-1 - New upstream version 0.5.2. - OCaml 4.06.0 rebuild. From a7ff40d65505582243fa77a785a26bd6954ce697 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 20 Jun 2018 09:54:55 +0100 Subject: [PATCH 05/62] OCaml 4.07.0-rc1 rebuild. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 799a1a6..154e981 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Wed Jun 20 2018 Richard W.M. Jones - 0.5.2-3 +- OCaml 4.07.0-rc1 rebuild. + * Thu Feb 08 2018 Fedora Release Engineering - 0.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From ab702654b43757638c00485143fbc2d9c0c61929 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 11 Jul 2018 16:16:52 +0100 Subject: [PATCH 06/62] OCaml 4.07.0 (final) rebuild. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 154e981..0cafbef 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Wed Jul 11 2018 Richard W.M. Jones - 0.5.2-4 +- OCaml 4.07.0 (final) rebuild. + * Wed Jun 20 2018 Richard W.M. Jones - 0.5.2-3 - OCaml 4.07.0-rc1 rebuild. From 1ffbba23142e44cfafae99857a97323d52da3199 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 14:43:24 +0000 Subject: [PATCH 07/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 0cafbef..138ca4e 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.5.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jul 11 2018 Richard W.M. Jones - 0.5.2-4 - OCaml 4.07.0 (final) rebuild. From 4321f22e107094b35fde9a75f685c3fef6126ae1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 16:49:57 +0000 Subject: [PATCH 08/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 138ca4e..251b3d5 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.5.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.5.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 97bde884b0d141cddd45af9afff2af9245d1b026 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Apr 2019 19:20:02 +0100 Subject: [PATCH 09/62] OCaml 4.08.0 (beta 3) rebuild. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 251b3d5..0675a92 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Mon Apr 29 2019 Richard W.M. Jones - 0.5.2-7 +- OCaml 4.08.0 (beta 3) rebuild. + * Fri Feb 01 2019 Fedora Release Engineering - 0.5.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 5ec440f4a14f535ead739c84d9e5d5df052609f8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Jun 2019 20:21:00 +0100 Subject: [PATCH 10/62] OCaml 4.08.0 (final) rebuild. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 0675a92..462a27c 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Thu Jun 27 2019 Richard W.M. Jones - 0.5.2-8 +- OCaml 4.08.0 (final) rebuild. + * Mon Apr 29 2019 Richard W.M. Jones - 0.5.2-7 - OCaml 4.08.0 (beta 3) rebuild. From 9ba1c1d331c3a95ff3f3f14c2ebc6c6f648a6ddf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 22:52:37 +0000 Subject: [PATCH 11/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 462a27c..d4faccb 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.5.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jun 27 2019 Richard W.M. Jones - 0.5.2-8 - OCaml 4.08.0 (final) rebuild. From 5376d4948308f85eeec58b98d760cc363418c236 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 31 Jul 2019 18:28:23 +0100 Subject: [PATCH 12/62] OCaml 4.08.1 (rc2) rebuild. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index d4faccb..d0a76f0 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Wed Jul 31 2019 Richard W.M. Jones - 0.5.2-10 +- OCaml 4.08.1 (rc2) rebuild. + * Thu Jul 25 2019 Fedora Release Engineering - 0.5.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 22e30adb77e8b0f12ecad69249fc0b7eebc52981 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 16 Aug 2019 15:49:11 +0100 Subject: [PATCH 13/62] OCaml 4.08.1 (final) rebuild. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index d0a76f0..fb5e3cb 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Fri Aug 16 2019 Richard W.M. Jones - 0.5.2-11 +- OCaml 4.08.1 (final) rebuild. + * Wed Jul 31 2019 Richard W.M. Jones - 0.5.2-10 - OCaml 4.08.1 (rc2) rebuild. From fbe397a401e6c45103712b1586a49d1e91aed50f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 6 Dec 2019 13:06:48 +0000 Subject: [PATCH 14/62] OCaml 4.09.0 (final) rebuild. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index fb5e3cb..0da1b2c 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Fri Dec 06 2019 Richard W.M. Jones - 0.5.2-12 +- OCaml 4.09.0 (final) rebuild. + * Fri Aug 16 2019 Richard W.M. Jones - 0.5.2-11 - OCaml 4.08.1 (final) rebuild. From aa68d4ba5509b148b6093168a11531e6f965661d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 9 Jan 2020 21:42:16 +0000 Subject: [PATCH 15/62] OCaml 4.09.0 for riscv64 --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 0da1b2c..4fcc854 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Thu Jan 09 2020 Richard W.M. Jones - 0.5.2-13 +- OCaml 4.09.0 for riscv64 + * Fri Dec 06 2019 Richard W.M. Jones - 0.5.2-12 - OCaml 4.09.0 (final) rebuild. From 2896b8bf317581256129891a9d4391031901159e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 19 Jan 2020 12:47:32 +0000 Subject: [PATCH 16/62] OCaml 4.10.0+beta1 rebuild. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 4fcc854..a7a826a 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Sun Jan 19 2020 Richard W.M. Jones - 0.5.2-14 +- OCaml 4.10.0+beta1 rebuild. + * Thu Jan 09 2020 Richard W.M. Jones - 0.5.2-13 - OCaml 4.09.0 for riscv64 From 2582102b44ad594e6cac86d7b03f5350e6135281 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 19:35:09 +0000 Subject: [PATCH 17/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index a7a826a..b6c959a 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.5.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Jan 19 2020 Richard W.M. Jones - 0.5.2-14 - OCaml 4.10.0+beta1 rebuild. From 91d04f1a2da1bb358584cabae88d299b62fe2f5a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 26 Feb 2020 14:17:08 +0000 Subject: [PATCH 18/62] OCaml 4.10.0 final. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index b6c959a..82bf323 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -95,6 +95,9 @@ make test %changelog +* Wed Feb 26 2020 Richard W.M. Jones - 0.5.2-16 +- OCaml 4.10.0 final. + * Wed Jan 29 2020 Fedora Release Engineering - 0.5.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 5453c499db24d178399790a51260076c5128c813 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Feb 2020 08:53:36 +0000 Subject: [PATCH 19/62] Use ounit2. --- ocaml-fileutils-0.5.2-ounit2.patch | 30 ++++++++++++++++++++++++++++++ ocaml-fileutils.spec | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 ocaml-fileutils-0.5.2-ounit2.patch diff --git a/ocaml-fileutils-0.5.2-ounit2.patch b/ocaml-fileutils-0.5.2-ounit2.patch new file mode 100644 index 0000000..96a21e0 --- /dev/null +++ b/ocaml-fileutils-0.5.2-ounit2.patch @@ -0,0 +1,30 @@ +diff -ur ocaml-fileutils-0.5.2.old/setup.ml ocaml-fileutils-0.5.2.new/setup.ml +--- ocaml-fileutils-0.5.2.old/setup.ml 2017-05-23 21:12:33.000000000 +0100 ++++ ocaml-fileutils-0.5.2.new/setup.ml 2020-02-27 08:52:42.964618292 +0000 +@@ -7621,7 +7621,7 @@ + InternalLibrary "fileutils"; + InternalLibrary "fileutils-str"; + FindlibPackage +- ("oUnit", ++ ("ounit2", + Some (OASISVersion.VGreaterEqual "2.0.0")) + ]; + bs_build_tools = [ExternalTool "ocamlbuild"]; +diff -ur ocaml-fileutils-0.5.2.old/_tags ocaml-fileutils-0.5.2.new/_tags +--- ocaml-fileutils-0.5.2.old/_tags 2017-05-23 21:12:33.000000000 +0100 ++++ ocaml-fileutils-0.5.2.new/_tags 2020-02-27 08:52:38.020680545 +0000 +@@ -25,12 +25,12 @@ + : pkg_unix + : use_fileutils + # Executable test +-"test/test.byte": pkg_oUnit ++"test/test.byte": pkg_ounit2 + "test/test.byte": pkg_str + "test/test.byte": pkg_unix + "test/test.byte": use_fileutils + "test/test.byte": use_fileutils-str +-: pkg_oUnit ++: pkg_ounit2 + : pkg_str + : pkg_unix + : use_fileutils diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 82bf323..cfc253d 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -8,6 +8,8 @@ URL: https://forge.ocamlcore.org/projects/ocaml-fileutils/ Source0: http://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.tar.gz Patch1: fileutils-0.5.2-fix-bytes.patch +# Use ounit2. +Patch2: ocaml-fileutils-0.5.2-ounit2.patch BuildRequires: ocaml >= 4.00.1 BuildRequires: ocaml-findlib-devel >= 1.3.3-3 From 28707cbf55a5560737c464f16762139f431caa8a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 4 Apr 2020 10:21:46 +0100 Subject: [PATCH 20/62] Update all OCaml dependencies for RPM 4.16. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index cfc253d..201f894 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -97,6 +97,9 @@ make test %changelog +* Sat Apr 04 2020 Richard W.M. Jones - 0.5.2-17 +- Update all OCaml dependencies for RPM 4.16. + * Wed Feb 26 2020 Richard W.M. Jones - 0.5.2-16 - OCaml 4.10.0 final. From cf2c67a4dce4baba0e856811b41cea71da557e8d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 21 Apr 2020 22:21:10 +0100 Subject: [PATCH 21/62] OCaml 4.11.0 pre-release attempt 2 --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 201f894..e340b70 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -97,6 +97,9 @@ make test %changelog +* Tue Apr 21 2020 Richard W.M. Jones - 0.5.2-18 +- OCaml 4.11.0 pre-release attempt 2 + * Sat Apr 04 2020 Richard W.M. Jones - 0.5.2-17 - Update all OCaml dependencies for RPM 4.16. From 78851ddfe144c5ccfd53ce888e9c20ce31f29d3c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 May 2020 14:36:02 +0100 Subject: [PATCH 22/62] OCaml 4.11.0+dev2-2020-04-22 rebuild --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index e340b70..56b0eb1 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 18%{?dist} +Release: 19%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -97,6 +97,9 @@ make test %changelog +* Tue May 05 2020 Richard W.M. Jones - 0.5.2-19 +- OCaml 4.11.0+dev2-2020-04-22 rebuild + * Tue Apr 21 2020 Richard W.M. Jones - 0.5.2-18 - OCaml 4.11.0 pre-release attempt 2 From b3cb6a32045ba98101488dbb8c4ed36c278174cf Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 May 2020 15:32:29 +0100 Subject: [PATCH 23/62] Bump and rebuild for s390x. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 56b0eb1..0800f19 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 19%{?dist} +Release: 20%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -97,6 +97,9 @@ make test %changelog +* Tue May 05 2020 Richard W.M. Jones - 0.5.2-20 +- Bump and rebuild for s390x. + * Tue May 05 2020 Richard W.M. Jones - 0.5.2-19 - OCaml 4.11.0+dev2-2020-04-22 rebuild From d2b4530731bc3d9c93a980d35b327b2b17c9f6e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 12:09:41 +0000 Subject: [PATCH 24/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 0800f19..ac993b1 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -97,6 +97,9 @@ make test %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.5.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 05 2020 Richard W.M. Jones - 0.5.2-20 - Bump and rebuild for s390x. From 5835956718788d8fc616cd3fdf7cdee67f961a7f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 06:37:31 +0000 Subject: [PATCH 25/62] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index ac993b1..c1ce4cf 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -97,6 +97,10 @@ make test %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.5.2-22 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.5.2-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0b9c6a5b39733ab9c11de23cb5b61729665962c1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 21 Aug 2020 19:15:10 +0100 Subject: [PATCH 26/62] OCaml 4.11.0 rebuild --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index c1ce4cf..51a902a 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -97,6 +97,9 @@ make test %changelog +* Fri Aug 21 2020 Richard W.M. Jones - 0.5.2-23 +- OCaml 4.11.0 rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 0.5.2-22 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d85115fe4d4c3e463385abd2c913b0970233b4fe Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 1 Sep 2020 21:37:06 +0100 Subject: [PATCH 27/62] OCaml 4.11.1 rebuild --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 51a902a..721eb90 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 23%{?dist} +Release: 24%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -97,6 +97,9 @@ make test %changelog +* Tue Sep 01 2020 Richard W.M. Jones - 0.5.2-24 +- OCaml 4.11.1 rebuild + * Fri Aug 21 2020 Richard W.M. Jones - 0.5.2-23 - OCaml 4.11.0 rebuild From b7b42723b7ba925356c28d898234d4b77b691339 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 06:13:40 +0000 Subject: [PATCH 28/62] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- ocaml-fileutils.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 721eb90..65b038b 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -11,6 +11,7 @@ Patch1: fileutils-0.5.2-fix-bytes.patch # Use ounit2. Patch2: ocaml-fileutils-0.5.2-ounit2.patch +BuildRequires: make BuildRequires: ocaml >= 4.00.1 BuildRequires: ocaml-findlib-devel >= 1.3.3-3 BuildRequires: ocaml-ocamldoc From a46d2b06260fcd016fb46c0cc02744f25e5ac1c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:57:24 +0000 Subject: [PATCH 29/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 65b038b..64fcdb3 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 24%{?dist} +Release: 25%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -98,6 +98,9 @@ make test %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.5.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Sep 01 2020 Richard W.M. Jones - 0.5.2-24 - OCaml 4.11.1 rebuild From 02d00f3b8a3c5efff8e57f3b286afda5bebbc757 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Mar 2021 21:31:03 +0000 Subject: [PATCH 30/62] OCaml 4.12.0 build --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 64fcdb3..577aaa6 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -98,6 +98,9 @@ make test %changelog +* Mon Mar 1 21:31:03 GMT 2021 Richard W.M. Jones - 0.5.2-26 +- OCaml 4.12.0 build + * Tue Jan 26 2021 Fedora Release Engineering - 0.5.2-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8a91444c2fc29841951ec11a5703adce652c7903 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Mar 2021 16:18:24 +0100 Subject: [PATCH 31/62] Bump and rebuild for ELN. --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 577aaa6..dfb4f34 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -98,6 +98,9 @@ make test %changelog +* Tue Mar 30 2021 Richard W.M. Jones - 0.5.2-27 +- Bump and rebuild for ELN. + * Mon Mar 1 21:31:03 GMT 2021 Richard W.M. Jones - 0.5.2-26 - OCaml 4.12.0 build From a51467fc8a8840ef6e2bff1dfb35312b1518660f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 16:37:37 +0000 Subject: [PATCH 32/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index dfb4f34..d68365e 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 27%{?dist} +Release: 28%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -98,6 +98,9 @@ make test %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.5.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 30 2021 Richard W.M. Jones - 0.5.2-27 - Bump and rebuild for ELN. From 7e73fedffad2ac472b9105be5ae589b4787a3658 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Oct 2021 10:27:23 +0100 Subject: [PATCH 33/62] OCaml 4.13.1 build --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index d68365e..edb04f8 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 28%{?dist} +Release: 29%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -98,6 +98,9 @@ make test %changelog +* Tue Oct 05 2021 Richard W.M. Jones - 0.5.2-29 +- OCaml 4.13.1 build + * Thu Jul 22 2021 Fedora Release Engineering - 0.5.2-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1f835fc3e78b65456602013c8dc49cee8eb2e6e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 21:43:58 +0000 Subject: [PATCH 34/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index edb04f8..185d5f9 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,6 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 29%{?dist} +Release: 30%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -98,6 +98,9 @@ make test %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.5.2-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Oct 05 2021 Richard W.M. Jones - 0.5.2-29 - OCaml 4.13.1 build From 658aeb5226107942ea726c0e9680f07bc8fc932b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Feb 2022 16:09:31 +0000 Subject: [PATCH 35/62] OCaml 4.13.1 rebuild to remove package notes --- ocaml-fileutils.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 185d5f9..6e3ec5e 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,6 +1,7 @@ +%undefine _package_note_flags Name: ocaml-fileutils Version: 0.5.2 -Release: 30%{?dist} +Release: 31%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -98,6 +99,9 @@ make test %changelog +* Fri Feb 04 2022 Richard W.M. Jones - 0.5.2-31 +- OCaml 4.13.1 rebuild to remove package notes + * Thu Jan 20 2022 Fedora Release Engineering - 0.5.2-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 28e1b4c2c209668a175b206eb001d608285ae676 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 19 Jun 2022 10:57:09 +0100 Subject: [PATCH 36/62] OCaml 4.14.0 rebuild --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 6e3ec5e..fe7ce9e 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,7 +1,7 @@ %undefine _package_note_flags Name: ocaml-fileutils Version: 0.5.2 -Release: 31%{?dist} +Release: 32%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -99,6 +99,9 @@ make test %changelog +* Sun Jun 19 2022 Richard W.M. Jones - 0.5.2-32 +- OCaml 4.14.0 rebuild + * Fri Feb 04 2022 Richard W.M. Jones - 0.5.2-31 - OCaml 4.13.1 rebuild to remove package notes From 149cfb213b7eb9a30b3ecb9ed9b9b5a3e654f8b5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 19 Jun 2022 11:04:15 +0100 Subject: [PATCH 37/62] Disable debuginfo generation Unclear why, probably -g is not being passed to all build commands. --- ocaml-fileutils.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index fe7ce9e..20332d1 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,4 +1,9 @@ %undefine _package_note_flags + +# We're probbaly not adding -g correctly: +# error: Empty %files file /builddir/build/BUILD/ocaml-fileutils-0.5.2/debugsourcefiles.list +%global debug_package %{nil} + Name: ocaml-fileutils Version: 0.5.2 Release: 32%{?dist} From 3a64a32c63b9069c57b799f8f59fb8f7b4cd22c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 01:13:43 +0000 Subject: [PATCH 38/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 20332d1..69b07d8 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -6,7 +6,7 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 32%{?dist} +Release: 33%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -104,6 +104,9 @@ make test %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 0.5.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jun 19 2022 Richard W.M. Jones - 0.5.2-32 - OCaml 4.14.0 rebuild From b128f6b28b2eaa6317586f371b82849ff25e04af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:08:04 +0000 Subject: [PATCH 39/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 69b07d8..3002592 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -6,7 +6,7 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 33%{?dist} +Release: 34%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -104,6 +104,9 @@ make test %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.5.2-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 0.5.2-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From fa311a9a1a54f70e564d41c6be566f44f74ac350 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 24 Jan 2023 14:37:36 +0000 Subject: [PATCH 40/62] Rebuild OCaml packages for F38 --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 3002592..9046d65 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -6,7 +6,7 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 34%{?dist} +Release: 35%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -104,6 +104,9 @@ make test %changelog +* Tue Jan 24 2023 Richard W.M. Jones - 0.5.2-35 +- Rebuild OCaml packages for F38 + * Thu Jan 19 2023 Fedora Release Engineering - 0.5.2-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5e2f341d10a68a6fc1cc4ea3f4a3dced36a4b0ee Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 24 Jan 2023 17:42:05 +0000 Subject: [PATCH 41/62] Bump release and rebuild --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 9046d65..34da622 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -6,7 +6,7 @@ Name: ocaml-fileutils Version: 0.5.2 -Release: 35%{?dist} +Release: 36%{?dist} Summary: OCaml library for common file and filename operations License: LGPLv2 with exceptions @@ -104,6 +104,9 @@ make test %changelog +* Tue Jan 24 2023 Richard W.M. Jones - 0.5.2-36 +- Bump release and rebuild + * Tue Jan 24 2023 Richard W.M. Jones - 0.5.2-35 - Rebuild OCaml packages for F38 From 8e92218a7111846cbb9c922e6015ba169c59a72c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 10 Jul 2023 22:17:17 -0600 Subject: [PATCH 42/62] Version 0.6.4 Other changes: - New project URLs - Convert License tag to SPDX - Drop upstreamed bytes and ounit2 patches - Build with dune --- .gitignore | 1 + fileutils-0.5.2-fix-bytes.patch | 20 ----- ocaml-fileutils-0.5.2-ounit2.patch | 30 ------- ocaml-fileutils-0.6.4-cmp.patch | 18 +++++ ocaml-fileutils-0.6.4-forward-compat.patch | 27 +++++++ ocaml-fileutils.spec | 93 ++++++++-------------- sources | 2 +- 7 files changed, 82 insertions(+), 109 deletions(-) delete mode 100644 fileutils-0.5.2-fix-bytes.patch delete mode 100644 ocaml-fileutils-0.5.2-ounit2.patch create mode 100644 ocaml-fileutils-0.6.4-cmp.patch create mode 100644 ocaml-fileutils-0.6.4-forward-compat.patch diff --git a/.gitignore b/.gitignore index 384150d..001651e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ ocaml-fileutils-0.4.0.tar.gz /ocaml-fileutils-0.4.5.tar.gz /ocaml-fileutils-0.5.1.tar.gz /ocaml-fileutils-0.5.2.tar.gz +/fileutils-0.6.4.tbz diff --git a/fileutils-0.5.2-fix-bytes.patch b/fileutils-0.5.2-fix-bytes.patch deleted file mode 100644 index cd0011d..0000000 --- a/fileutils-0.5.2-fix-bytes.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ocaml-fileutils-0.5.2.old/src/FileUtilCP.ml 2017-05-23 21:12:19.000000000 +0100 -+++ ocaml-fileutils-0.5.2/src/FileUtilCP.ml 2017-11-08 17:36:42.271524209 +0000 -@@ -138,7 +138,7 @@ - end - in - -- let buffer = String.make 1024 ' ' in -+ let buffer = Bytes.make 1024 ' ' in - - let cp_file st_src dst_exists fn_src fn_dst = - let mode = int_of_permission st_src.permission in -@@ -176,7 +176,7 @@ - try - while (read := - handle_exception -- (Unix.read fd_src buffer 0) (String.length buffer) -+ (Unix.read fd_src buffer 0) (Bytes.length buffer) - (fun e -> `ErrorRead(fn_src, e)); - !read <> 0) do - let written = diff --git a/ocaml-fileutils-0.5.2-ounit2.patch b/ocaml-fileutils-0.5.2-ounit2.patch deleted file mode 100644 index 96a21e0..0000000 --- a/ocaml-fileutils-0.5.2-ounit2.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur ocaml-fileutils-0.5.2.old/setup.ml ocaml-fileutils-0.5.2.new/setup.ml ---- ocaml-fileutils-0.5.2.old/setup.ml 2017-05-23 21:12:33.000000000 +0100 -+++ ocaml-fileutils-0.5.2.new/setup.ml 2020-02-27 08:52:42.964618292 +0000 -@@ -7621,7 +7621,7 @@ - InternalLibrary "fileutils"; - InternalLibrary "fileutils-str"; - FindlibPackage -- ("oUnit", -+ ("ounit2", - Some (OASISVersion.VGreaterEqual "2.0.0")) - ]; - bs_build_tools = [ExternalTool "ocamlbuild"]; -diff -ur ocaml-fileutils-0.5.2.old/_tags ocaml-fileutils-0.5.2.new/_tags ---- ocaml-fileutils-0.5.2.old/_tags 2017-05-23 21:12:33.000000000 +0100 -+++ ocaml-fileutils-0.5.2.new/_tags 2020-02-27 08:52:38.020680545 +0000 -@@ -25,12 +25,12 @@ - : pkg_unix - : use_fileutils - # Executable test --"test/test.byte": pkg_oUnit -+"test/test.byte": pkg_ounit2 - "test/test.byte": pkg_str - "test/test.byte": pkg_unix - "test/test.byte": use_fileutils - "test/test.byte": use_fileutils-str --: pkg_oUnit -+: pkg_ounit2 - : pkg_str - : pkg_unix - : use_fileutils diff --git a/ocaml-fileutils-0.6.4-cmp.patch b/ocaml-fileutils-0.6.4-cmp.patch new file mode 100644 index 0000000..a966e28 --- /dev/null +++ b/ocaml-fileutils-0.6.4-cmp.patch @@ -0,0 +1,18 @@ +--- 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 new file mode 100644 index 0000000..2b1e084 --- /dev/null +++ b/ocaml-fileutils-0.6.4-forward-compat.patch @@ -0,0 +1,27 @@ +--- 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 34da622..7fd06fe 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -1,30 +1,27 @@ -%undefine _package_note_flags - -# We're probbaly not adding -g correctly: -# error: Empty %files file /builddir/build/BUILD/ocaml-fileutils-0.5.2/debugsourcefiles.list +%ifnarch %{ocaml_native_compiler} %global debug_package %{nil} +%endif Name: ocaml-fileutils -Version: 0.5.2 -Release: 36%{?dist} +Version: 0.6.4 +Release: 1%{?dist} Summary: OCaml library for common file and filename operations -License: LGPLv2 with exceptions -URL: https://forge.ocamlcore.org/projects/ocaml-fileutils/ -Source0: http://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.tar.gz +License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception +URL: https://gildor478.github.io/ocaml-fileutils/ +Source0: https://github.com/gildor478/ocaml-fileutils/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 -Patch1: fileutils-0.5.2-fix-bytes.patch -# Use ounit2. -Patch2: ocaml-fileutils-0.5.2-ounit2.patch - -BuildRequires: make -BuildRequires: ocaml >= 4.00.1 -BuildRequires: ocaml-findlib-devel >= 1.3.3-3 -BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml >= 4.03.0 +BuildRequires: ocaml-dune >= 1.11.0 %if 0%{?fedora} || 0%{?rhel} <= 6 -BuildRequires: ocaml-ounit-devel +BuildRequires: ocaml-ounit-devel >= 2.0.0 %endif -BuildRequires: ocaml-ocamlbuild %description @@ -40,7 +37,7 @@ abstract filenames. %package devel Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -49,61 +46,41 @@ developing applications that use %{name}. %prep -%setup -q -%autopatch -p1 +%autosetup -n fileutils-%{version} -p1 %build -# Disable the tests (RHEL 7 only) since they require ocaml-ounit. -ocaml setup.ml -configure --prefix %{_prefix} --destdir $RPM_BUILD_ROOT \ -%if 0%{?rhel} >= 7 - --disable-tests -%else - --enable-tests -%endif -make +%dune_build %install -export DESTDIR=$RPM_BUILD_ROOT -export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml -mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs - -# Set htmldir to current directory, then copy the docs (in api/) -# as a %doc rule. -make htmldir=. install +%dune_install +# Do not run the tests (RHEL 7+ only) since they require ocaml-ounit. +%if 0%{?fedora} || 0%{?rhel} <= 6 %check -%if ! 0%{?rhel} >= 7 -make test +%dune_check %endif -%files -%doc COPYING.txt -%{_libdir}/ocaml/fileutils -%ifarch %{ocaml_native_compiler} -%exclude %{_libdir}/ocaml/fileutils/*.a -%exclude %{_libdir}/ocaml/fileutils/*.cmx -%exclude %{_libdir}/ocaml/fileutils/*.cmxa -%endif -%exclude %{_libdir}/ocaml/fileutils/*.ml -%exclude %{_libdir}/ocaml/fileutils/*.mli +%files -f .ofiles +%license LICENSE.txt -%files devel -%doc COPYING.txt AUTHORS.txt CHANGELOG.txt README.txt TODO.txt -%ifarch %{ocaml_native_compiler} -%{_libdir}/ocaml/fileutils/*.a -%{_libdir}/ocaml/fileutils/*.cmx -%{_libdir}/ocaml/fileutils/*.cmxa -%endif -%{_libdir}/ocaml/fileutils/*.ml -%{_libdir}/ocaml/fileutils/*.mli +%files devel -f .ofiles-devel +%doc README.md CHANGES.md +%license LICENSE.txt %changelog +* Mon Jul 10 2023 Jerry James - 0.6.4-1 +- Version 0.6.4 +- New project URLs +- Convert License tag to SPDX +- Drop upstreamed bytes and ounit2 patches +- Build with dune + * Tue Jan 24 2023 Richard W.M. Jones - 0.5.2-36 - Bump release and rebuild diff --git a/sources b/sources index 23e4068..565179f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ocaml-fileutils-0.5.2.tar.gz) = 264282c54ff693686ca9e60f371038f8ea9bce219d04556297dc7b6028c9f65c5a03b7cd263c3519cb212e29665200db1c95c88874bb2cb3d7b610e3b832018d +SHA512 (fileutils-0.6.4.tbz) = 7053f8d92655d5631f1ec61ab7f9e3f6e3afedbe435038858dd9a026b9c769c6182afaa436491a398e7c4513b384a609e016718e030855996b2d9d54b461bd19 From 174c4f6ebed412056b941775246da40725f90af1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 11:36:23 +0100 Subject: [PATCH 43/62] ExcludeArch i686 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/) --- ocaml-fileutils.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 7fd06fe..5f3b6e7 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.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 d06a274c6245afb9d3a935d70ffa70b400459b29 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 12 Jul 2023 00:17:42 +0100 Subject: [PATCH 44/62] OCaml 5.0 rebuild for Fedora 39 --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 5f3b6e7..e5598cd 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.4 -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 @@ -77,6 +77,9 @@ developing applications that use %{name}. %changelog +* Tue Jul 11 2023 Richard W.M. Jones - 0.6.4-2 +- OCaml 5.0 rebuild for Fedora 39 + * Mon Jul 10 2023 Jerry James - 0.6.4-1 - Version 0.6.4 - New project URLs From 3dac68f42d396e8d232fbb74b4749851b519582e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 17:17:23 +0000 Subject: [PATCH 45/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index e5598cd..5d0bcac 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.4 -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 @@ -77,6 +77,9 @@ developing applications that use %{name}. %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Richard W.M. Jones - 0.6.4-2 - OCaml 5.0 rebuild for Fedora 39 From b683ec35b229c610f4894d1849c27401c2b45d7a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Oct 2023 16:04:49 +0100 Subject: [PATCH 46/62] OCaml 5.1 rebuild for Fedora 40 --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 5d0bcac..a461c29 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.4 -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 @@ -77,6 +77,9 @@ developing applications that use %{name}. %changelog +* Thu Oct 05 2023 Richard W.M. Jones - 0.6.4-4 +- OCaml 5.1 rebuild for Fedora 40 + * Thu Jul 20 2023 Fedora Release Engineering - 0.6.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d8e48ef75af3ff9f7c927cc146d214d2c3d52014 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Dec 2023 14:44:35 +0000 Subject: [PATCH 47/62] OCaml 5.1.1 rebuild for Fedora 40 --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index a461c29..275c6c0 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.4 -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 @@ -77,6 +77,9 @@ developing applications that use %{name}. %changelog +* Tue Dec 12 2023 Richard W.M. Jones - 0.6.4-5 +- OCaml 5.1.1 rebuild for Fedora 40 + * Thu Oct 05 2023 Richard W.M. Jones - 0.6.4-4 - OCaml 5.1 rebuild for Fedora 40 From 2ed22a0f19e90249788fb7c20237a9fc567251c9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Dec 2023 15:05:57 +0000 Subject: [PATCH 48/62] OCaml 5.1.1 + s390x code gen fix for Fedora 40 --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 275c6c0..a16a2c7 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: OCaml library for common file and filename operations License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -77,6 +77,9 @@ developing applications that use %{name}. %changelog +* Mon Dec 18 2023 Richard W.M. Jones - 0.6.4-6 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + * Tue Dec 12 2023 Richard W.M. Jones - 0.6.4-5 - OCaml 5.1.1 rebuild for Fedora 40 From 364d7d1d30d5a1074083237dae592db902f562fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 10:16:06 +0000 Subject: [PATCH 49/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index a16a2c7..3c8b738 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: OCaml library for common file and filename operations License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -77,6 +77,9 @@ developing applications that use %{name}. %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.6.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 18 2023 Richard W.M. Jones - 0.6.4-6 - OCaml 5.1.1 + s390x code gen fix for Fedora 40 From aead5407c252a13fced28542fcb9a9afa25967b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 09:59:07 +0000 Subject: [PATCH 50/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 3c8b738..f5b75b4 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: OCaml library for common file and filename operations License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -77,6 +77,9 @@ developing applications that use %{name}. %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.6.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.6.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0b776a7ac6979883b04a9cff6ed2e0322a92da8d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 23 May 2024 11:55:14 -0600 Subject: [PATCH 51/62] Add VCS field --- ocaml-fileutils.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index f5b75b4..9b320c1 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -12,7 +12,8 @@ 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/ -Source0: https://github.com/gildor478/ocaml-fileutils/releases/download/v%{version}/fileutils-%{version}.tbz +VCS: https://github.com/gildor478/ocaml-fileutils +Source0: %{vcs}/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 From 267e2f68af3c54ca468d437518217290abbeed1b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 29 May 2024 22:10:50 +0100 Subject: [PATCH 52/62] OCaml 5.2.0 for Fedora 41 --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 9b320c1..20f91f3 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: OCaml library for common file and filename operations License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -78,6 +78,9 @@ developing applications that use %{name}. %changelog +* Wed May 29 2024 Richard W.M. Jones - 0.6.4-9 +- OCaml 5.2.0 for Fedora 41 + * Thu Jan 25 2024 Fedora Release Engineering - 0.6.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4d2c5014c49bfaa04ed7f63c01644e6891963bbc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 09:21:14 +0100 Subject: [PATCH 53/62] 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..9c74e1c --- /dev/null +++ b/tests/basic-test.sh @@ -0,0 +1,8 @@ +#!/bin/bash - +set -e +set -x + +# Compile trivial fileutils program. +echo 'assert (FilePath.compare "/" "/" = 0)' > filetest.ml +ocamlfind ocamlopt -package fileutils filetest.ml -linkpkg -o filetest +./filetest diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100755 index 0000000..24edee1 --- /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-fileutils-devel + tests: + - simple: + dir: . + run: ./basic-test.sh From 773c929684fa878b88d06cc199968231b982ae4f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 16:29:22 +0100 Subject: [PATCH 54/62] OCaml 5.2.0 ppc64le fix --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 20f91f3..73c3ad5 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: OCaml library for common file and filename operations License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -78,6 +78,9 @@ developing applications that use %{name}. %changelog +* Wed Jun 19 2024 Richard W.M. Jones - 0.6.4-10 +- OCaml 5.2.0 ppc64le fix + * Wed May 29 2024 Richard W.M. Jones - 0.6.4-9 - OCaml 5.2.0 for Fedora 41 From 5f93dd1c6d6bb3cf6e9c62764c83b0612161f23c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Jul 2024 13:58:13 -0600 Subject: [PATCH 55/62] Fix the VCS field --- ocaml-fileutils.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 73c3ad5..a740743 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -5,6 +5,8 @@ ExcludeArch: %{ix86} %global debug_package %{nil} %endif +%global giturl https://github.com/gildor478/ocaml-fileutils + Name: ocaml-fileutils Version: 0.6.4 Release: 10%{?dist} @@ -12,8 +14,8 @@ 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: https://github.com/gildor478/ocaml-fileutils -Source0: %{vcs}/releases/download/v%{version}/fileutils-%{version}.tbz +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 From 463344a9321ccd63048321789ec69aaef824d039 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:06:48 +0000 Subject: [PATCH 56/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ocaml-fileutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index a740743..3325797 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -9,7 +9,7 @@ ExcludeArch: %{ix86} Name: ocaml-fileutils Version: 0.6.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: OCaml library for common file and filename operations License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception @@ -80,6 +80,9 @@ developing applications that use %{name}. %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.6.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 19 2024 Richard W.M. Jones - 0.6.4-10 - OCaml 5.2.0 ppc64le fix From 26e1fe9f861de23a4105c779325718f5da9885c9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 9 Jan 2025 20:43:03 -0700 Subject: [PATCH 57/62] 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 58/62] 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 1b68af0abb9976ddd2d9e546df6f915742a93d74 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 12 Jul 2025 13:11:17 -0600 Subject: [PATCH 59/62] 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 60/62] 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 61/62] 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 62/62] 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