Compare commits

..

31 Commits
f27 ... rawhide

Author SHA1 Message Date
Richard W.M. Jones
8a91444c2f Bump and rebuild for ELN. 2021-03-30 16:18:24 +01:00
Richard W.M. Jones
02d00f3b8a OCaml 4.12.0 build 2021-03-01 21:31:03 +00:00
Fedora Release Engineering
a46d2b0626 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 21:57:24 +00:00
Tom Stellard
b7b42723b7 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-07 06:13:40 +00:00
Richard W.M. Jones
d85115fe4d OCaml 4.11.1 rebuild 2020-09-01 21:37:06 +01:00
Richard W.M. Jones
0b9c6a5b39 OCaml 4.11.0 rebuild 2020-08-21 19:15:10 +01:00
Fedora Release Engineering
5835956718 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 06:37:31 +00:00
Fedora Release Engineering
d2b4530731 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 12:09:41 +00:00
Richard W.M. Jones
b3cb6a3204 Bump and rebuild for s390x. 2020-05-05 15:32:29 +01:00
Richard W.M. Jones
78851ddfe1 OCaml 4.11.0+dev2-2020-04-22 rebuild 2020-05-05 14:36:02 +01:00
Richard W.M. Jones
cf2c67a4dc OCaml 4.11.0 pre-release attempt 2 2020-04-21 22:21:10 +01:00
Richard W.M. Jones
28707cbf55 Update all OCaml dependencies for RPM 4.16. 2020-04-04 10:21:46 +01:00
Richard W.M. Jones
5453c499db Use ounit2. 2020-02-27 08:53:36 +00:00
Richard W.M. Jones
91d04f1a2d OCaml 4.10.0 final. 2020-02-26 14:17:08 +00:00
Fedora Release Engineering
2582102b44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 19:35:09 +00:00
Richard W.M. Jones
2896b8bf31 OCaml 4.10.0+beta1 rebuild. 2020-01-19 12:47:32 +00:00
Richard W.M. Jones
aa68d4ba55 OCaml 4.09.0 for riscv64 2020-01-09 21:42:16 +00:00
Richard W.M. Jones
fbe397a401 OCaml 4.09.0 (final) rebuild. 2019-12-06 13:06:48 +00:00
Richard W.M. Jones
22e30adb77 OCaml 4.08.1 (final) rebuild. 2019-08-16 15:49:11 +01:00
Richard W.M. Jones
5376d49483 OCaml 4.08.1 (rc2) rebuild. 2019-07-31 18:28:23 +01:00
Fedora Release Engineering
9ba1c1d331 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 22:52:37 +00:00
Richard W.M. Jones
5ec440f4a1 OCaml 4.08.0 (final) rebuild. 2019-06-27 20:21:00 +01:00
Richard W.M. Jones
97bde884b0 OCaml 4.08.0 (beta 3) rebuild. 2019-04-29 19:20:02 +01:00
Fedora Release Engineering
4321f22e10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 16:49:57 +00:00
Fedora Release Engineering
1ffbba2314 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 14:43:24 +00:00
Richard W.M. Jones
ab702654b4 OCaml 4.07.0 (final) rebuild. 2018-07-11 16:16:52 +01:00
Richard W.M. Jones
a7ff40d655 OCaml 4.07.0-rc1 rebuild. 2018-06-20 09:54:55 +01:00
Fedora Release Engineering
a256cca3db - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 08:50:08 +00:00
Richard W.M. Jones
1f1fd12874 Fixes for version 0.5.2. 2017-11-08 17:41:04 +00:00
Richard W.M. Jones
a9e8600c63 New upstream version 0.5.2.
OCaml 4.06.0 rebuild.
2017-11-08 17:24:31 +00:00
Richard W.M. Jones
3bb953ce84 OCaml 4.06.0 rebuild. 2017-11-08 17:00:31 +00:00
5 changed files with 155 additions and 18 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ 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

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 =

View File

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

View File

@ -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.1 Version: 0.5.2
Release: 8%{?dist} Release: 27%{?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/1651/ocaml-fileutils-0.5.1.tar.gz 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: 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,16 +44,17 @@ 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
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 make
@ -68,13 +69,15 @@ 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
%if %opt %ifarch %{ocaml_native_compiler}
%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
@ -85,7 +88,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
%if %opt %ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/fileutils/*.a %{_libdir}/ocaml/fileutils/*.a
%{_libdir}/ocaml/fileutils/*.cmx %{_libdir}/ocaml/fileutils/*.cmx
%{_libdir}/ocaml/fileutils/*.cmxa %{_libdir}/ocaml/fileutils/*.cmxa
@ -95,6 +98,89 @@ 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.

View File

@ -1 +1 @@
2fe185bbce4357eb5fba1dfc0b3e63c5 ocaml-fileutils-0.5.1.tar.gz SHA512 (ocaml-fileutils-0.5.2.tar.gz) = 264282c54ff693686ca9e60f371038f8ea9bce219d04556297dc7b6028c9f65c5a03b7cd263c3519cb212e29665200db1c95c88874bb2cb3d7b610e3b832018d