Compare commits
No commits in common. "rawhide" and "f27" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,4 +2,3 @@ ocaml-fileutils-0.4.0.tar.gz
|
|||||||
/ocaml-fileutils-0.4.4.tar.gz
|
/ocaml-fileutils-0.4.4.tar.gz
|
||||||
/ocaml-fileutils-0.4.5.tar.gz
|
/ocaml-fileutils-0.4.5.tar.gz
|
||||||
/ocaml-fileutils-0.5.1.tar.gz
|
/ocaml-fileutils-0.5.1.tar.gz
|
||||||
/ocaml-fileutils-0.5.2.tar.gz
|
|
||||||
|
@ -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 =
|
|
@ -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 @@
|
|
||||||
<test/BenchFind.{native,byte}>: pkg_unix
|
|
||||||
<test/BenchFind.{native,byte}>: 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
|
|
||||||
-<test/*.ml{,i,y}>: pkg_oUnit
|
|
||||||
+<test/*.ml{,i,y}>: pkg_ounit2
|
|
||||||
<test/*.ml{,i,y}>: pkg_str
|
|
||||||
<test/*.ml{,i,y}>: pkg_unix
|
|
||||||
<test/*.ml{,i,y}>: use_fileutils
|
|
@ -1,17 +1,17 @@
|
|||||||
|
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
||||||
|
%if ! %opt
|
||||||
|
%global debug_package %{nil}
|
||||||
|
%endif
|
||||||
|
|
||||||
Name: ocaml-fileutils
|
Name: ocaml-fileutils
|
||||||
Version: 0.5.2
|
Version: 0.5.1
|
||||||
Release: 27%{?dist}
|
Release: 8%{?dist}
|
||||||
Summary: OCaml library for common file and filename operations
|
Summary: OCaml library for common file and filename operations
|
||||||
|
|
||||||
License: LGPLv2 with exceptions
|
License: LGPLv2 with exceptions
|
||||||
URL: https://forge.ocamlcore.org/projects/ocaml-fileutils/
|
URL: https://forge.ocamlcore.org/projects/ocaml-fileutils/
|
||||||
Source0: http://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.tar.gz
|
Source0: http://forge.ocamlcore.org/frs/download.php/1651/ocaml-fileutils-0.5.1.tar.gz
|
||||||
|
|
||||||
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 >= 4.00.1
|
||||||
BuildRequires: ocaml-findlib-devel >= 1.3.3-3
|
BuildRequires: ocaml-findlib-devel >= 1.3.3-3
|
||||||
BuildRequires: ocaml-ocamldoc
|
BuildRequires: ocaml-ocamldoc
|
||||||
@ -44,17 +44,16 @@ developing applications that use %{name}.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%autopatch -p1
|
|
||||||
|
# Disable the tests (RHEL 7 only) since they require ocaml-ounit.
|
||||||
|
%if 0%{?rhel} >= 7
|
||||||
|
rm test/test.ml
|
||||||
|
touch test/test.ml
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Disable the tests (RHEL 7 only) since they require ocaml-ounit.
|
ocaml setup.ml -configure --prefix %{_prefix} --destdir $RPM_BUILD_ROOT
|
||||||
ocaml setup.ml -configure --prefix %{_prefix} --destdir $RPM_BUILD_ROOT \
|
|
||||||
%if 0%{?rhel} >= 7
|
|
||||||
--disable-tests
|
|
||||||
%else
|
|
||||||
--enable-tests
|
|
||||||
%endif
|
|
||||||
make
|
make
|
||||||
|
|
||||||
|
|
||||||
@ -69,15 +68,13 @@ make htmldir=. install
|
|||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if ! 0%{?rhel} >= 7
|
|
||||||
make test
|
make test
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc COPYING.txt
|
%doc COPYING.txt
|
||||||
%{_libdir}/ocaml/fileutils
|
%{_libdir}/ocaml/fileutils
|
||||||
%ifarch %{ocaml_native_compiler}
|
%if %opt
|
||||||
%exclude %{_libdir}/ocaml/fileutils/*.a
|
%exclude %{_libdir}/ocaml/fileutils/*.a
|
||||||
%exclude %{_libdir}/ocaml/fileutils/*.cmx
|
%exclude %{_libdir}/ocaml/fileutils/*.cmx
|
||||||
%exclude %{_libdir}/ocaml/fileutils/*.cmxa
|
%exclude %{_libdir}/ocaml/fileutils/*.cmxa
|
||||||
@ -88,7 +85,7 @@ make test
|
|||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%doc COPYING.txt AUTHORS.txt CHANGELOG.txt README.txt TODO.txt
|
%doc COPYING.txt AUTHORS.txt CHANGELOG.txt README.txt TODO.txt
|
||||||
%ifarch %{ocaml_native_compiler}
|
%if %opt
|
||||||
%{_libdir}/ocaml/fileutils/*.a
|
%{_libdir}/ocaml/fileutils/*.a
|
||||||
%{_libdir}/ocaml/fileutils/*.cmx
|
%{_libdir}/ocaml/fileutils/*.cmx
|
||||||
%{_libdir}/ocaml/fileutils/*.cmxa
|
%{_libdir}/ocaml/fileutils/*.cmxa
|
||||||
@ -98,89 +95,6 @@ make test
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* 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
|
|
||||||
|
|
||||||
* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-4
|
|
||||||
- OCaml 4.07.0 (final) rebuild.
|
|
||||||
|
|
||||||
* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-3
|
|
||||||
- OCaml 4.07.0-rc1 rebuild.
|
|
||||||
|
|
||||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 0.5.2-1
|
|
||||||
- New upstream version 0.5.2.
|
|
||||||
- OCaml 4.06.0 rebuild.
|
|
||||||
|
|
||||||
* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 0.5.1-8
|
* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 0.5.1-8
|
||||||
- OCaml 4.05.0 rebuild.
|
- OCaml 4.05.0 rebuild.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user