Compare commits
59 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
8a91444c2f | ||
|
02d00f3b8a | ||
|
a46d2b0626 | ||
|
b7b42723b7 | ||
|
d85115fe4d | ||
|
0b9c6a5b39 | ||
|
5835956718 | ||
|
d2b4530731 | ||
|
b3cb6a3204 | ||
|
78851ddfe1 | ||
|
cf2c67a4dc | ||
|
28707cbf55 | ||
|
5453c499db | ||
|
91d04f1a2d | ||
|
2582102b44 | ||
|
2896b8bf31 | ||
|
aa68d4ba55 | ||
|
fbe397a401 | ||
|
22e30adb77 | ||
|
5376d49483 | ||
|
9ba1c1d331 | ||
|
5ec440f4a1 | ||
|
97bde884b0 | ||
|
4321f22e10 | ||
|
1ffbba2314 | ||
|
ab702654b4 | ||
|
a7ff40d655 | ||
|
a256cca3db | ||
|
1f1fd12874 | ||
|
a9e8600c63 | ||
|
3bb953ce84 | ||
|
792a25558b | ||
|
e74539732b | ||
|
d7ee4dbe7e | ||
|
36cce5fdd5 | ||
|
6805494124 | ||
|
b6a4535102 | ||
|
cfe764443a | ||
|
5b2dbb3b28 | ||
|
54619be479 | ||
|
9a53c4b12d | ||
|
8bb161a04e | ||
|
56fc114c89 | ||
|
44dc7a95ca | ||
|
0900ab7e9f | ||
|
ed29408038 | ||
|
295fca0653 | ||
|
f9786fd01b | ||
|
a3383dbb40 | ||
|
b91fe551b5 | ||
|
d15f56ead1 | ||
|
62d5883ca5 | ||
|
2168adef1d | ||
|
590b4bef59 | ||
|
3cc0ee909d | ||
|
fa5b6a269c | ||
|
b4ae611ca6 | ||
|
89ed995a34 | ||
|
e8898cb5a9 |
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,2 +1,5 @@
|
||||
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
|
||||
|
20
fileutils-0.5.2-fix-bytes.patch
Normal file
20
fileutils-0.5.2-fix-bytes.patch
Normal 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 =
|
30
ocaml-fileutils-0.5.2-ounit2.patch
Normal file
30
ocaml-fileutils-0.5.2-ounit2.patch
Normal 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
|
@ -1,23 +1,24 @@
|
||||
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
||||
%global debug_package %{nil}
|
||||
|
||||
Name: ocaml-fileutils
|
||||
Version: 0.4.4
|
||||
Release: 6%{?dist}
|
||||
Version: 0.5.2
|
||||
Release: 27%{?dist}
|
||||
Summary: OCaml library for common file and filename operations
|
||||
|
||||
License: LGPLv2 with exceptions
|
||||
URL: https://forge.ocamlcore.org/projects/ocaml-fileutils/
|
||||
Source0: https://forge.ocamlcore.org/frs/download.php/892/ocaml-fileutils-0.4.4.tar.gz
|
||||
ExcludeArch: sparc64 s390 s390x
|
||||
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-findlib-devel >= 1.3.3-3
|
||||
BuildRequires: ocaml-ocamldoc
|
||||
BuildRequires: ocaml-camlp4-devel
|
||||
%if 0%{?fedora} || 0%{?rhel} <= 6
|
||||
BuildRequires: ocaml-ounit-devel
|
||||
%endif
|
||||
BuildRequires: ocaml-ocamlbuild
|
||||
|
||||
|
||||
%description
|
||||
@ -43,19 +44,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
|
||||
mv setup.ml setup.ml.old
|
||||
sed '/oUnit/d' < setup.ml.old > setup.ml
|
||||
%endif
|
||||
|
||||
ocaml setup.ml -configure --prefix %{_prefix} --destdir $RPM_BUILD_ROOT
|
||||
%autopatch -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
|
||||
|
||||
|
||||
@ -70,13 +69,15 @@ make htmldir=. install
|
||||
|
||||
|
||||
%check
|
||||
%if ! 0%{?rhel} >= 7
|
||||
make test
|
||||
%endif
|
||||
|
||||
|
||||
%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
|
||||
@ -87,7 +88,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
|
||||
@ -97,6 +98,160 @@ make test
|
||||
|
||||
|
||||
%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
|
||||
- OCaml 4.05.0 rebuild.
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 0.5.1-5
|
||||
- OCaml 4.04.2 rebuild.
|
||||
|
||||
* Fri May 12 2017 Richard W.M. Jones <rjones@redhat.com> - 0.5.1-4
|
||||
- OCaml 4.04.1 rebuild.
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 0.5.1-2
|
||||
- rebuild for s390x codegen bug
|
||||
|
||||
* Fri Nov 04 2016 Richard W.M. Jones <rjones@redhat.com> - 0.5.1-1
|
||||
- New upstream version 0.5.1.
|
||||
- Add explicit dependency on ocamlbuild.
|
||||
|
||||
* Mon Sep 12 2016 Dan Horák <dan[at]danny.cz> - 0.4.5-17
|
||||
- disable debuginfo subpackage on interpreted builds
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.5-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-15
|
||||
- OCaml 4.02.3 rebuild.
|
||||
|
||||
* Mon Jul 27 2015 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-14
|
||||
- Remove ExcludeArch since bytecode build should now work.
|
||||
|
||||
* Tue Jun 23 2015 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-13
|
||||
- Bump release and rebuild.
|
||||
|
||||
* Wed Jun 17 2015 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-12
|
||||
- ocaml-4.02.2 rebuild.
|
||||
|
||||
* Mon Feb 16 2015 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-11
|
||||
- ocaml-4.02.1 rebuild.
|
||||
|
||||
* Sat Aug 30 2014 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-10
|
||||
- ocaml-4.02.0 final rebuild.
|
||||
|
||||
* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-9
|
||||
- ocaml-4.02.0+rc1 rebuild.
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.5-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Aug 02 2014 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-7
|
||||
- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
|
||||
|
||||
* Mon Jul 21 2014 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-6
|
||||
- OCaml 4.02.0 beta rebuild.
|
||||
|
||||
* Mon Jul 14 2014 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-5
|
||||
- Rebuild for OCaml 4.02.0.
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-1
|
||||
- New upstream version 0.4.5.
|
||||
- Enable debuginfo.
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.4-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user