rpms/ocaml-fileutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: rpms:c10s
Branches Tags
rpms:c8
rpms:c10s
rpms:c8s
rpms:c9
rpms:c9-beta
rpms:c9s
rpms:imports/c10s/ocaml-fileutils-0.6.4-12.el10
rpms:imports/c10s/ocaml-fileutils-0.6.4-11.el10
rpms:imports/c9/ocaml-fileutils-0.5.2-29.el9
rpms:imports/c9-beta/ocaml-fileutils-0.5.2-29.el9
rpms:imports/c8/ocaml-fileutils-0.5.2-5.el8
..
compare: rpms:c8
Branches Tags
rpms:c10s
rpms:c8s
rpms:c9
rpms:c9-beta
rpms:c9s
rpms:c8
rpms:imports/c10s/ocaml-fileutils-0.6.4-12.el10
rpms:imports/c10s/ocaml-fileutils-0.6.4-11.el10
rpms:imports/c9/ocaml-fileutils-0.5.2-29.el9
rpms:imports/c9-beta/ocaml-fileutils-0.5.2-29.el9
rpms:imports/c8/ocaml-fileutils-0.5.2-5.el8

No commits in common. "c10s" and "c8" have entirely different histories.
c10s ... c8

10 changed files with 73 additions and 248 deletions
Show Stats Expand all files Collapse all files

7
.gitignore vendored
View File

@ -1,6 +1 @@
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
/fileutils-0.6.4.tbz
SOURCES/ocaml-fileutils-0.5.2.tar.gz

1
.ocaml-fileutils.metadata Normal file
View File

@ -0,0 +1 @@
ee236a4e6ec69b1007d19f7b0d7f56f094a21d8b SOURCES/ocaml-fileutils-0.5.2.tar.gz

20
SOURCES/fileutils-0.5.2-fix-bytes.patch Normal file
View File

@ -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 =

220
ocaml-fileutils.spec → SPECS/ocaml-fileutils.spec
View File

@ -1,31 +1,21 @@
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
ExcludeArch: %{ix86}
%ifnarch %{ocaml_native_compiler}
%global debug_package %{nil}
%endif
Name: ocaml-fileutils
Version: 0.6.4
Release: 12%{?dist}
Version: 0.5.2
Release: 5%{?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: 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
# 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
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
BuildRequires: ocaml >= 4.03.0
BuildRequires: ocaml-dune >= 1.11.0
Patch1: fileutils-0.5.2-fix-bytes.patch
BuildRequires: ocaml >= 4.00.1
BuildRequires: ocaml-findlib-devel >= 1.3.3-3
BuildRequires: ocaml-ocamldoc
%if 0%{?fedora} || 0%{?rhel} <= 6
BuildRequires: ocaml-ounit-devel >= 2.0.0
BuildRequires: ocaml-ounit-devel
%endif
BuildRequires: ocaml-ocamlbuild
%description
@ -41,7 +31,7 @@ abstract filenames.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description devel
@ -50,169 +40,61 @@ developing applications that use %{name}.
%prep
%autosetup -n fileutils-%{version} -p1
%setup -q
%autopatch -p1
%build
%dune_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
%install
%dune_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
# Do not run the tests (RHEL 7+ only) since they require ocaml-ounit.
%if 0%{?fedora} || 0%{?rhel} <= 6
%check
%dune_check
%if ! 0%{?rhel} >= 7
make test
%endif
%files -f .ofiles
%license LICENSE.txt
%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 devel -f .ofiles-devel
%doc README.md CHANGES.md
%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
%changelog
* Wed Oct 30 2024 Troy Dawson <tdawson@redhat.com> - 0.6.4-12
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Tue Jun 25 2024 Troy Dawson <tdawson@redhat.com> - 0.6.4-11
- Bump release for June 2024 mass rebuild
* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 0.6.4-10
- OCaml 5.2.0 ppc64le fix
* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 0.6.4-9
- OCaml 5.2.0 for Fedora 41
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6.4-6
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6.4-5
- OCaml 5.1.1 rebuild for Fedora 40
* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6.4-4
- OCaml 5.1 rebuild for Fedora 40
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6.4-2
- OCaml 5.0 rebuild for Fedora 39
* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 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 <rjones@redhat.com> - 0.5.2-36
- Bump release and rebuild
* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-35
- Rebuild OCaml packages for F38
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Jun 19 2022 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-32
- OCaml 4.14.0 rebuild
* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-31
- OCaml 4.13.1 rebuild to remove package notes
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Oct 05 2021 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-29
- OCaml 4.13.1 build
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Mar 30 2021 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-27
- Bump and rebuild for ELN.
* Mon Mar 1 21:31:03 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-26
- OCaml 4.12.0 build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-24
- OCaml 4.11.1 rebuild
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-23
- OCaml 4.11.0 rebuild
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-22
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 05 2020 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-20
- Bump and rebuild for s390x.
* Tue May 05 2020 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-19
- OCaml 4.11.0+dev2-2020-04-22 rebuild
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-18
- OCaml 4.11.0 pre-release attempt 2
* Sat Apr 04 2020 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-17
- Update all OCaml dependencies for RPM 4.16.
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-16
- OCaml 4.10.0 final.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-14
- OCaml 4.10.0+beta1 rebuild.
* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-13
- OCaml 4.09.0 for riscv64
* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-12
- OCaml 4.09.0 (final) rebuild.
* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-11
- OCaml 4.08.1 (final) rebuild.
* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-10
- OCaml 4.08.1 (rc2) rebuild.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-8
- OCaml 4.08.0 (final) rebuild.
* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-7
- OCaml 4.08.0 (beta 3) rebuild.
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

6
gating.yaml
View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

18
ocaml-fileutils-0.6.4-cmp.patch
View File

@ -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)

27
ocaml-fileutils-0.6.4-forward-compat.patch
View File

@ -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))

1
sources
View File

@ -1 +0,0 @@
SHA512 (fileutils-0.6.4.tbz) = 7053f8d92655d5631f1ec61ab7f9e3f6e3afedbe435038858dd9a026b9c769c6182afaa436491a398e7c4513b384a609e016718e030855996b2d9d54b461bd19

8
tests/basic-test.sh
View File

@ -1,8 +0,0 @@
#!/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

13
tests/tests.yml
View File

@ -1,13 +0,0 @@
- hosts: localhost
roles:
- role: standard-test-basic
tags:
- classic
required_packages:
- ocaml
- ocaml-findlib
- ocaml-fileutils-devel
tests:
- simple:
dir: .
run: ./basic-test.sh