Compare commits

...
Sign in to create a new pull request.

100 commits

Author SHA1 Message Date
Jerry James
eea7434021 Fix a changelog entry 2026-01-13 16:24:29 -07:00
Richard W.M. Jones
7d01903ff7 OCaml 5.4.0 rebuild 2025-10-13 12:52:55 +01:00
Fedora Release Engineering
4cc60c6533 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 23:10:54 +00:00
Jerry James
9033149637 Rebuild to fix OCaml dependencies 2025-07-11 10:38:37 -06:00
Fedora Release Engineering
550c7d394e Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-17 20:49:40 +00:00
Jerry James
b11d2d2f2f OCaml 5.3.0 rebuild for Fedora 42 2025-01-09 10:15:11 -07:00
Jerry James
58f1cf08af Version 1.9.8
- Drop workaround for upstream dynlink_subdir bug
- Change config name to findlib.conf to match upstream
- Update %__ocaml_requires_opts for OCaml 5.3.0
2024-12-26 20:07:22 -07:00
Fedora Release Engineering
73c23efe29 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 20:06:58 +00:00
Jerry James
6409759442 Fix the VCS field 2024-07-17 13:58:36 -06:00
Richard W.M. Jones
f029a3cf43 Add RHEL gating test 2024-06-19 13:46:04 +01:00
Richard W.M. Jones
dc90075ef1 OCaml 5.2.0 ppc64le fix 2024-06-19 11:39:51 +01:00
Richard W.M. Jones
f2a4218c0c OCaml 5.2.0 for Fedora 41 2024-05-29 17:33:35 +01:00
Jerry James
e8351d91e3 Skip broken test for ocamlopt -g 2024-05-23 09:23:21 -06:00
Richard W.M. Jones
6eaef8225a Bump and rebuild 2024-01-29 22:04:09 +00:00
Fedora Release Engineering
85085437af Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 09:59:16 +00:00
Fedora Release Engineering
f184034a96 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 10:16:15 +00:00
Richard W.M. Jones
67571698f3 OCaml 5.1.1 + s390x code gen fix for Fedora 40 2023-12-18 13:21:47 +00:00
Richard W.M. Jones
0f76562aad OCaml 5.1.1 rebuild for Fedora 40 2023-12-12 08:47:57 +00:00
Richard W.M. Jones
c3d92b7a58 OCaml 5.1 rebuild for Fedora 40 2023-10-05 12:18:59 +01:00
Jerry James
26cf444068 Build an executable that is not damaged by stripping 2023-10-04 21:14:11 -06:00
Fedora Release Engineering
88eec2b4e2 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 17:17:33 +00:00
Richard W.M. Jones
278b327b48 OCaml 5.0 rebuild for Fedora 39 2023-07-11 20:15:18 +01:00
Richard W.M. Jones
2b61fb74d8 ExcludeArch i686 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/) 2023-07-11 11:36:23 +01:00
Jerry James
1a949b42a9 OCaml 5.0.0 rebuild
Other changes:
- Verify the License is valid SPDX
- Fix natdynlink detection
- Add patch to fix toolbox build for OCaml 5.x
- Convert README to UTF-8
- Use new OCaml macros
2023-07-10 14:28:53 -06:00
Richard W.M. Jones
81e8f9639f Rebuild OCaml packages for F38 2023-01-24 08:50:21 +00:00
Richard W.M. Jones
223ba21d87 New upstream version 1.9.6 2023-01-23 20:28:50 +00:00
Fedora Release Engineering
5cf430f520 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 22:08:13 +00:00
Fedora Release Engineering
b5373e9cf4 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-22 01:13:54 +00:00
Richard W.M. Jones
6f54a5225c New upstream version 1.9.5 2022-06-19 13:39:39 +01:00
Richard W.M. Jones
aa88eb5cd0 OCaml 4.14.0 rebuild 2022-06-18 14:30:53 +01:00
Richard W.M. Jones
1c221f632c Update to findlib 1.9.4 2022-06-08 18:16:18 +01:00
Richard W.M. Jones
984434a66f OCaml 4.13.1 rebuild to remove package notes 2022-02-04 12:10:47 +00:00
Richard W.M. Jones
f346b20b7c Update link to bugs about package notes 2022-01-26 14:11:58 +00:00
Richard W.M. Jones
b4183a7463 Add %undefine _package_note_file 2022-01-26 13:55:45 +00:00
Richard W.M. Jones
3dc9828813 Update to findlib 1.9.3 2022-01-26 12:46:02 +00:00
Richard W.M. Jones
5896f52b7a Update to findlib 1.9.2 2022-01-22 08:26:45 +00:00
Fedora Release Engineering
2f042865de - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 21:44:07 +00:00
Jerry James
1b1f14d130 Fix labltk detection. Change license from BSD to MIT. 2022-01-07 09:15:42 -07:00
Richard W.M. Jones
06175e87d2 Bump and rebuild for updated ocaml-labltk 2021-10-04 18:41:59 +01:00
Richard W.M. Jones
bb2180ccd7 OCaml 4.13.1 build 2021-10-04 17:36:42 +01:00
Richard W.M. Jones
e593869402 New upstream development version 1.9.1 2021-10-04 17:22:20 +01:00
Richard W.M. Jones
5b47ababea Rebuild for changed ocamlx(Dynlink) 2021-07-27 19:19:51 +01:00
Fedora Release Engineering
0eda5a4868 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 16:37:46 +00:00
Richard W.M. Jones
cfcdad51ea New upstream version 1.9. 2021-03-15 15:28:17 +00:00
Richard W.M. Jones
fc51f9e003 Bump and rebuild for ELN broken deps. 2021-03-15 11:44:40 +00:00
Richard W.M. Jones
6e79c64f1b Rebuild for updated ocaml-labltk 2021-03-01 09:47:54 +00:00
Richard W.M. Jones
49bcd4dd02 OCaml 4.12.0 build 2021-03-01 09:37:09 +00:00
Richard W.M. Jones
d6a9da2635 Bump and rebuild for updated ocaml Dynlink dependency. 2021-02-01 18:24:48 +00:00
Fedora Release Engineering
63d9aa9e5e - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 21:57:32 +00:00
Tom Stellard
e600cfab68 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-07 06:13:54 +00:00
Richard W.M. Jones
03d1ff9dfb OCaml 4.11.1 rebuild 2020-09-01 19:58:03 +01:00
Richard W.M. Jones
512e1930ce OCaml 4.11.0 rebuild 2020-08-21 11:48:02 +01:00
Richard W.M. Jones
97b0721117 Bump and rebuild to fix Dynlink dependency. 2020-08-03 20:53:28 +01:00
Fedora Release Engineering
8068bb1779 - 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:39 +00:00
Fedora Release Engineering
003009d2ad - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 12:09:49 +00:00
Richard W.M. Jones
f55d860c6d OCaml 4.11.0+dev2-2020-04-22 rebuild 2020-05-04 22:42:48 +01:00
Richard W.M. Jones
e28df26fcd OCaml 4.11.0 pre-release attempt 2 2020-04-21 16:36:35 +01:00
Richard W.M. Jones
09eaa23655 OCaml 4.11.0 pre-release 2020-04-17 21:05:30 +01:00
Richard W.M. Jones
1aaa658212 Update all OCaml dependencies for RPM 4.16. 2020-04-02 13:06:45 +01:00
Richard W.M. Jones
27a8de100c OCaml 4.10.0 final. 2020-02-26 10:37:12 +00:00
Fedora Release Engineering
8703f91af5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 19:35:20 +00:00
Richard W.M. Jones
d1ed7b3e3e OCaml 4.10.0+beta1 rebuild. 2020-01-19 11:42:25 +00:00
Richard W.M. Jones
81ed82592c Bump release and rebuild. 2020-01-09 13:30:49 +00:00
Richard W.M. Jones
0c7567a132 OCaml 4.09.0 for riscv64 2020-01-08 10:25:26 +00:00
Richard W.M. Jones
b382e889ae Bump and rebuild for fixed ocaml(runtime) dependency. 2019-12-05 18:11:05 +00:00
Richard W.M. Jones
9187c90a21 OCaml 4.09.0 (final) rebuild. 2019-12-05 17:54:45 +00:00
Richard W.M. Jones
a37e7f4aee Final removal of camlp4. 2019-12-05 17:33:30 +00:00
Richard W.M. Jones
25d373ba07 Revert "Disable ocaml-camlp4 dependency until ported to 4.08."
This reverts commit acebfa162d.
2019-09-02 15:28:47 +01:00
Richard W.M. Jones
8309addcd7 OCaml 4.08.1 (final) rebuild. 2019-08-16 10:34:26 +01:00
Richard W.M. Jones
3bf13b2e78 OCaml 4.08.1 (rc2) rebuild. 2019-07-31 10:52:30 +01:00
Richard W.M. Jones
1c3cba7d25 New upstream version 1.8.1, and OCaml 4.08.1 (rc2) rebuild. 2019-07-31 09:52:57 +01:00
Fedora Release Engineering
14c96aef35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 22:52:47 +00:00
Richard W.M. Jones
e6a9a6910e OCaml 4.08.0 (final) rebuild. 2019-06-27 16:02:25 +01:00
Richard W.M. Jones
3f3706af23 OCaml 4.08.0 (beta 3) rebuild. 2019-04-29 17:50:31 +01:00
Richard W.M. Jones
acebfa162d Disable ocaml-camlp4 dependency until ported to 4.08. 2019-04-29 17:49:35 +01:00
Fedora Release Engineering
f957fa0847 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 16:50:07 +00:00
Fedora Release Engineering
6fdcba03ce - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 14:43:30 +00:00
Richard W.M. Jones
3f237d48d3 OCaml 4.07.0 (final) rebuild. 2018-07-11 12:30:13 +01:00
Richard W.M. Jones
da7cbaa7ba OCaml 4.07.0-rc1 rebuild. 2018-06-19 20:11:29 +01:00
Richard W.M. Jones
e4ce403f6b Update to findlib 1.8.0.
- Remove upstream patches.
2018-04-26 14:34:54 +01:00
Fedora Release Engineering
bcaab7341b - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 08:50:18 +00:00
Richard W.M. Jones
3f25a1dfa0 Bump release and rebuild. 2017-11-08 14:41:58 +00:00
Richard W.M. Jones
a8fb85be43 Disable num package again as it still doesn't work. 2017-11-08 14:38:21 +00:00
Richard W.M. Jones
f81be34920 And reenable num-top package.
This reverts commit 73e1f4383d.
2017-11-08 14:32:43 +00:00
Richard W.M. Jones
e583bf52e8 BR ocaml-num-devel (unfortunately a circular dependency). 2017-11-08 14:31:49 +00:00
Richard W.M. Jones
73e1f4383d Disable num-top subpackage (why?) 2017-11-07 22:02:23 +00:00
Richard W.M. Jones
92d2cdf5eb Upstream patch to fix detection of "num" package. 2017-11-07 22:00:52 +00:00
Richard W.M. Jones
711fbdce59 OCaml 4.06.0 rebuild. 2017-11-07 21:38:57 +00:00
Richard W.M. Jones
cd5ddbb0b6 Enable stripping and debuginfo on s390x.
Use ocaml_native_compiler macro instead of opt test.
2017-09-22 10:53:37 +01:00
Richard W.M. Jones
f856abc6ed OCaml 4.05.0 rebuild. 2017-08-07 16:50:10 +01:00
Fedora Release Engineering
b4bc4d2e9f - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 04:15:49 +00:00
Fedora Release Engineering
957b9bf2c6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 01:28:12 +00:00
Richard W.M. Jones
8441a23cb2 OCaml 4.04.2 rebuild. 2017-06-26 16:33:56 +01:00
Richard W.M. Jones
733bdde228 New upstream version 1.7.3. 2017-06-05 21:23:34 +01:00
Richard W.M. Jones
ce08e5bc15 Rebuild for OCaml 4.04.1. 2017-05-10 14:46:57 +01:00
Fedora Release Engineering
65d5ea58a7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 00:31:48 +00:00
Richard W.M. Jones
ddaa544bb0 New upstream version 1.7.1. 2016-11-22 11:12:46 +00:00
Dan Horák
bad5ff524c - rebuild for s390x codegen bug 2016-11-09 18:58:59 +01:00
Richard W.M. Jones
6ad2e39b29 Force ocamlbuild and labltk to be installed so findlib creates META for them. 2016-11-05 12:09:26 +00:00
Richard W.M. Jones
ffbe5694bb New upstream version 1.6.3. 2016-11-04 10:10:37 +00:00
8 changed files with 477 additions and 64 deletions

13
.gitignore vendored
View file

@ -9,3 +9,16 @@ findlib-1.2.5.tar.gz
/findlib-1.5.2.tar.gz
/findlib-1.5.5.tar.gz
/findlib-1.6.2.tar.gz
/findlib-1.6.3.tar.gz
/findlib-1.7.1.tar.gz
/findlib-1.7.3.tar.gz
/findlib-1.8.0.tar.gz
/findlib-1.8.1.tar.gz
/findlib-1.9.tar.gz
/findlib-1.9.1.tar.gz
/findlib-1.9.2.tar.gz
/findlib-1.9.3.tar.gz
/findlib-1.9.4.tar.gz
/findlib-1.9.5.tar.gz
/findlib-1.9.6.tar.gz
/findlib-1.9.8.tar.gz

View file

@ -1,11 +0,0 @@
--- ./findlib-1.4/src/findlib/Makefile.old 2013-09-13 22:13:25.322978268 +0100
+++ ./findlib-1.4/src/findlib/Makefile 2013-09-13 22:13:38.289999908 +0100
@@ -14,7 +14,7 @@
# Need compiler-libs since ocaml-4.00
OCAMLC = ocamlc -I +compiler-libs
-OCAMLOPT = ocamlopt -I +compiler-libs
+OCAMLOPT = ocamlopt -I +compiler-libs -g
OCAMLDEP = ocamldep
OCAMLLEX = ocamllex
#CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_o.cmo --

6
gating.yaml Executable file
View file

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

117
ocaml-findlib-toolbox.patch Normal file
View file

@ -0,0 +1,117 @@
--- findlib-1.9.6/src/findlib-toolbox/Makefile.orig 2022-09-24 09:13:16.000000000 -0600
+++ findlib-1.9.6/src/findlib-toolbox/Makefile 2023-06-16 08:46:01.965686356 -0600
@@ -9,7 +9,7 @@ opt:
true
make_wizard$(EXEC_SUFFIX): make_wizard.ml
- ocamlc -o make_wizard$(EXEC_SUFFIX) -I +unix -I +labltk -I ../findlib \
+ ocamlc -o make_wizard$(EXEC_SUFFIX) -I +str -I +unix -I +labltk -I ../findlib \
unix.cma str.cma labltk.cma findlib.cma make_wizard.ml
install:
--- findlib-1.9.6/src/findlib-toolbox/make_wizard.ml.orig 2022-09-24 09:13:16.000000000 -0600
+++ findlib-1.9.6/src/findlib-toolbox/make_wizard.ml 2023-06-16 08:50:49.066603769 -0600
@@ -468,23 +468,23 @@ let makemake() =
mkquote(metaquote !wiz_package_description);
"byte_objects",
String.concat " " (List.map
- (fun m -> String.uncapitalize m ^ ".cmo")
+ (fun m -> String.uncapitalize_ascii m ^ ".cmo")
!wiz_objects);
"nat_objects",
String.concat " " (List.map
- (fun m -> String.uncapitalize m ^ ".cmx")
+ (fun m -> String.uncapitalize_ascii m ^ ".cmx")
!wiz_objects);
"byte_executables",
String.concat " " byte_execs;
"byte_exec_objects",
String.concat " " (List.map
- (fun m -> String.uncapitalize m ^ ".cmo")
+ (fun m -> String.uncapitalize_ascii m ^ ".cmo")
byte_exec_modules);
"nat_executables",
String.concat " " nat_execs;
"nat_exec_objects",
String.concat " " (List.map
- (fun m -> String.uncapitalize m ^ ".cmx")
+ (fun m -> String.uncapitalize_ascii m ^ ".cmx")
nat_exec_modules);
"prereqs",
String.concat " " required_packages;
@@ -526,7 +526,7 @@ let makemake() =
let deptargets =
String.concat " " (List.map
(fun m ->
- let m' = String.uncapitalize m in
+ let m' = String.uncapitalize_ascii m in
m' ^ ".ml " ^ m' ^ ".mli")
!modlist) in
write "makemake_exec" ( [ "switches", switches;
@@ -543,7 +543,7 @@ let makemake() =
if is_byte_exec execname then begin
let execobjs =
String.concat " " (List.map
- (fun m -> String.uncapitalize m ^ ".cmo")
+ (fun m -> String.uncapitalize_ascii m ^ ".cmo")
!modlist) in
write "byte_exec" ( ["execname", execname;
"execobjs", execobjs ] @ variables )
@@ -555,7 +555,7 @@ let makemake() =
if not (is_byte_exec execname) then begin
let execobjs =
String.concat " " (List.map
- (fun m -> String.uncapitalize m ^ ".cmx")
+ (fun m -> String.uncapitalize_ascii m ^ ".cmx")
!modlist) in
write "nat_exec" ( ["execname", execname;
"execobjs", execobjs ] @ variables )
@@ -1090,7 +1090,7 @@ let pkginfo lb row = (* when the user r
let files = Array.to_list(Sys.readdir dir) in
List.map
(fun name ->
- String.capitalize (Filename.chop_suffix name ".cmi"))
+ String.capitalize_ascii (Filename.chop_suffix name ".cmi"))
(List.filter
(fun name ->
Filename.check_suffix name ".cmi")
@@ -1128,7 +1128,7 @@ let preprocessor_scan_extensions() =
not (List.mem pkg plist)
)
!wiz_camlp4_selected in
- List.sort Pervasives.compare (plist @ plist')
+ List.sort Stdlib.compare (plist @ plist')
;;
@@ -1196,7 +1196,7 @@ add_screen preprocessor_screen;;
let prerequisites_scan_packages() =
(* Find out all packages *)
- List.sort Pervasives.compare (Fl_package_base.list_packages())
+ List.sort Stdlib.compare (Fl_package_base.list_packages())
;;
@@ -1255,10 +1255,10 @@ let buildlib_scan_modules() =
let files'' =
List.map
(fun f ->
- String.capitalize (Filename.chop_extension f)
+ String.capitalize_ascii (Filename.chop_extension f)
)
files' in
- remove_dups (List.sort Pervasives.compare files'')
+ remove_dups (List.sort Stdlib.compare files'')
;;
@@ -1353,7 +1353,7 @@ build any.";
end
else begin
wiz_executables :=
- List.sort Pervasives.compare (name :: !wiz_executables);
+ List.sort Stdlib.compare (name :: !wiz_executables);
wiz_exec_objects := (name, ref []) :: !wiz_exec_objects;
wiz_exec_native := (name, ref false) :: !wiz_exec_native;
!update_listbox();

View file

@ -1,35 +1,35 @@
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
# On s/390x, ocamlfind is still built using -custom option, so it must
# not be stripped. See:
# https://fedoraproject.org/wiki/Packaging:OCaml?rd=Packaging/OCaml#Stripping_binaries
%if !%opt
%global __strip /bin/true
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
ExcludeArch: %{ix86}
%ifnarch %{ocaml_native_compiler}
%global debug_package %{nil}
%endif
Name: ocaml-findlib
Version: 1.6.2
Release: 1%{?dist}
Version: 1.9.8
Release: 5%{?dist}
Summary: Objective CAML package manager and build helper
License: BSD
License: MIT
URL: http://projects.camlcity.org/projects/findlib.html
VCS: git:https://github.com/ocaml/ocamlfind.git
Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz
# Use ocamlopt -g patch to include debug information.
Patch1: findlib-1.4-add-debug.patch
# Fix the toolbox build with OCaml 5.x
Patch0: %{name}-toolbox.patch
BuildRequires: ocaml >= 4.02.0
BuildRequires: ocaml-camlp4-devel
#BuildRequires: ocaml-labltk-devel
BuildRequires: ocaml-labltk-devel
BuildRequires: ocaml-ocamlbuild
BuildRequires: ocaml-compiler-libs
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros
BuildRequires: m4, ncurses-devel
BuildRequires: gawk
BuildRequires: make
Requires: ocaml
%global __ocaml_requires_opts -i Asttypes -i Parsetree
# Do not require ocaml-compiler-libs at runtime
%global __ocaml_requires_opts -i Asttypes -i Build_path_prefix_map -i Cmi_format -i Env -i Format_doc -i Ident -i Identifiable -i Load_path -i Location -i Longident -i Misc -i Oprint -i Outcometree -i Parsetree -i Path -i Primitive -i Shape -i Subst -i Topdirs -i Toploop -i Type_immediacy -i Types -i Unit_info -i Warnings
%description
@ -38,7 +38,7 @@ Objective CAML package manager and build helper.
%package devel
Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@ -47,8 +47,21 @@ developing applications that use %{name}.
%prep
%setup -q -n findlib-%{version}
%patch1 -p2
%autosetup -p1 -n findlib-%{version}
# Fix character encoding
iconv -f ISO8859-1 -t UTF-8 doc/README > doc/README.utf8
touch -r doc/README doc/README.utf8
mv doc/README.utf8 doc/README
# Fix the OCaml core man directory
sed -i 's,/usr/local/man,%{_mandir},' configure
# Build an executable that is not damaged by stripping
sed -i 's/\(custom=\)-custom/\1-output-complete-exe/' configure
# Skip broken test for ocamlopt -g
sed -i '/^ocamlopt -g/d' configure
%build
@ -57,59 +70,315 @@ ocamlc -where
(cd tools/extract_args && make)
tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocamlmktop ocamlopt ocamldep ocamldoc ||:
cat src/findlib/ocaml_args.ml
./configure -config %{_sysconfdir}/ocamlfind.conf \
./configure -config %{_sysconfdir}/findlib.conf \
-bindir %{_bindir} \
-sitelib `ocamlc -where` \
-mandir %{_mandir} \
-with-toolbox
make all
%if %opt
make opt
%make_build all
%ifarch %{ocaml_native_compiler}
%make_build opt
%endif
rm doc/guide-html/TIMESTAMP
%install
# Grrr destdir grrrr
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5}
make install \
prefix=$RPM_BUILD_ROOT \
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
%make_install \
OCAMLFIND_BIN=%{_bindir} \
OCAMLFIND_CONF=%{_sysconfdir} \
OCAMLFIND_MAN=%{_mandir}
rmdir $RPM_BUILD_ROOT%{_mandir}/man3
%ocaml_files
sed -i '/etc/d' .ofiles
%files
%files -f .ofiles
%doc LICENSE doc/README
%config(noreplace) %{_sysconfdir}/ocamlfind.conf
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_libdir}/ocaml/*/META
%{_libdir}/ocaml/topfind
%{_libdir}/ocaml/findlib
%if %opt
%exclude %{_libdir}/ocaml/findlib/*.a
%exclude %{_libdir}/ocaml/findlib/*.cmxa
%endif
%exclude %{_libdir}/ocaml/findlib/*.mli
%exclude %{_libdir}/ocaml/findlib/Makefile.config
%exclude %{_libdir}/ocaml/findlib/make_wizard
%exclude %{_libdir}/ocaml/findlib/make_wizard.pattern
%{_libdir}/ocaml/num-top
%config(noreplace) %{_sysconfdir}/findlib.conf
%files devel
%files devel -f .ofiles-devel
%doc LICENSE doc/README doc/guide-html
%if %opt
%{_libdir}/ocaml/findlib/*.a
%{_libdir}/ocaml/findlib/*.cmxa
%endif
%{_libdir}/ocaml/findlib/*.mli
%{_libdir}/ocaml/findlib/Makefile.config
%changelog
* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1.9.8-5
- OCaml 5.4.0 rebuild
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 1.9.8-3
- Rebuild to fix OCaml dependencies
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jan 9 2025 Jerry James <loganjerry@gmail.com> - 1.9.8-1
- OCaml 5.3.0 rebuild for Fedora 42
- Version 1.9.8
- Drop workaround for upstream dynlink_subdir bug
- Change config name to findlib.conf to match upstream
- Update __ocaml_requires_opts for OCaml 5.3.0
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-13
- OCaml 5.2.0 ppc64le fix
* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-12
- OCaml 5.2.0 for Fedora 41
* Mon Jan 29 2024 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-11
- Bump and rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-8
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-7
- OCaml 5.1.1 rebuild for Fedora 40
* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-6
- OCaml 5.1 rebuild for Fedora 40
* Wed Oct 4 2023 Jerry James <loganjerry@gmail.com> - 1.9.6-5
- Build an executable that is not damaged by stripping
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-4
- OCaml 5.0 rebuild for Fedora 39
* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 1.9.6-3
- OCaml 5.0.0 rebuild
- Verify the License is valid SPDX
- Fix natdynlink detection
- Add patch to fix toolbox build for OCaml 5.x
- Convert README to UTF-8
- Use new OCaml macros
* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-2
- Rebuild OCaml packages for F38
* Mon Jan 23 2023 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-1
- New upstream version 1.9.6
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Jun 19 2022 Richard W.M. Jones <rjones@redhat.com> - 1.9.5-1
- New upstream version 1.9.5
* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 1.9.4-2
- OCaml 4.14.0 rebuild
* Wed Jun 08 2022 Richard W.M. Jones <rjones@redhat.com> - 1.9.4-1
- Update to findlib 1.9.4
* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1.9.3-2
- OCaml 4.13.1 rebuild to remove package notes
* Wed Jan 26 2022 Richard W.M. Jones <rjones@redhat.com> - 1.9.3-1
- Update to findlib 1.9.3
* Sat Jan 22 2022 Richard W.M. Jones <rjones@redhat.com> - 1.9.2-1
- Update to findlib 1.9.2
- Remove patch which has been applied upstream.
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jan 7 2022 Jerry James <loganjerry@gmail.com> - 1.9.1-4
- Fix labltk detection
- Change license from BSD to MIT
* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9.1-3
- Bump and rebuild for updated ocaml-labltk
* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9.1-2
- OCaml 4.13.1 build
* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9.1-1
- New upstream development version 1.9.1
* Tue Jul 27 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9-3
- Rebuild for changed ocamlx(Dynlink)
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9-1
- New upstream version 1.9.
* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-26
- Bump and rebuild for ELN broken deps.
* Mon Mar 1 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-25
- Rebuild for updated ocaml-labltk
* Mon Mar 1 09:37:08 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-24
- OCaml 4.12.0 build
* Mon Feb 1 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-23
- Bump and rebuild for updated ocaml Dynlink dependency.
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-21
- OCaml 4.11.1 rebuild
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-20
- OCaml 4.11.0 rebuild
* Mon Aug 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-19
- Bump and rebuild to fix Dynlink dependency.
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-18
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-16
- OCaml 4.11.0+dev2-2020-04-22 rebuild
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-15
- OCaml 4.11.0 pre-release attempt 2
* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-14
- OCaml 4.11.0 pre-release
* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-13
- Update all OCaml dependencies for RPM 4.16.
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-12
- OCaml 4.10.0 final.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-10
- OCaml 4.10.0+beta1 rebuild.
* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-9
- Bump release and rebuild.
* Wed Jan 08 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-8
- OCaml 4.09.0 for riscv64
* Thu Dec 05 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-7
- Bump and rebuild for fixed ocaml(runtime) dependency.
* Thu Dec 05 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-6
- OCaml 4.09.0 (final) rebuild.
* Thu Dec 05 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-5
- Final removal of camlp4.
* Mon Sep 02 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-4
- Rebuild with camlp4.
* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-3
- OCaml 4.08.1 (final) rebuild.
* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-2
- OCaml 4.08.1 (rc2) rebuild.
* Tue Jul 30 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-1
- New upstream version 1.8.1.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-8
- OCaml 4.08.0 (final) rebuild.
* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-7
- OCaml 4.08.0 (beta 3) rebuild.
* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-6
- Disable ocaml-camlp4 dependency until ported to 4.08.
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-3
- OCaml 4.07.0 (final) rebuild.
* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-2
- OCaml 4.07.0-rc1 rebuild.
* Thu Apr 26 2018 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-1
- Update to findlib 1.8.0.
- Remove upstream patches.
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-9
- Bump release and rebuild.
* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-8
- BR ocaml-num-devel (unfortunately a circular dependency).
* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-7
- OCaml 4.06.0 rebuild.
* Fri Sep 22 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-6
- Enable stripping and debuginfo on s390x.
- Use ocaml_native_compiler macro instead of opt test.
* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-5
- OCaml 4.05.0 rebuild.
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-2
- OCaml 4.04.2 rebuild.
* Mon Jun 5 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-1
- New upstream version 1.7.3.
* Wed May 10 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.1-3
- Rebuild for OCaml 4.04.1.
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Tue Nov 22 2016 Richard W.M. Jones <rjones@redhat.com> - 1.7.1-1
- New upstream version 1.7.1.
* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 1.6.3-3
- rebuild for s390x codegen bug
* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 1.6.3-2
- Force ocamlbuild and labltk to be installed so findlib creates META for them.
* Fri Nov 04 2016 Richard W.M. Jones <rjones@redhat.com> - 1.6.3-1
- New upstream version 1.6.3.
* Tue Jul 19 2016 Richard W.M. Jones <rjones@redhat.com> - 1.6.2-1
- New upstream version 1.6.2.
- Fix make install rule.

View file

@ -1 +1 @@
530ff275d6b96e140f0d3a03ed14b68e findlib-1.6.2.tar.gz
SHA512 (findlib-1.9.8.tar.gz) = 64aa28ac27358e1bc5d118e283fb64757fb96329151860bb9c1e9352a9fa1728ebcb4320b8d2eeb57ed2eea83c9849ea89d06c0fa25e1884ececb431341f9f1a

7
tests/basic-test.sh Executable file
View file

@ -0,0 +1,7 @@
#!/bin/bash -
set -e
set -x
# There's not really any reason to test this as chain builds
# use findlib extensively. Just check the binary functions.
ocamlfind query findlib

12
tests/tests.yml Executable file
View file

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