From 5cf430f5202f9d3c00fe79950bd089a42ec58c9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:08:13 +0000 Subject: [PATCH 01/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 8b26bd1..a91e31d 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -6,7 +6,7 @@ Name: ocaml-findlib Version: 1.9.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -105,6 +105,9 @@ make install \ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.9.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 1.9.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 223ba21d873d32fe59d8befaef4c7126191341c5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 23 Jan 2023 20:28:50 +0000 Subject: [PATCH 02/27] New upstream version 1.9.6 --- .gitignore | 1 + ocaml-findlib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dc7075f..02a869b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ findlib-1.2.5.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 diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index a91e31d..6cbfaf9 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -5,8 +5,8 @@ %undefine _package_note_file Name: ocaml-findlib -Version: 1.9.5 -Release: 3%{?dist} +Version: 1.9.6 +Release: 1%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -105,6 +105,9 @@ make install \ %changelog +* Mon Jan 23 2023 Richard W.M. Jones - 1.9.6-1 +- New upstream version 1.9.6 + * Thu Jan 19 2023 Fedora Release Engineering - 1.9.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 38c8501..91ef8e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (findlib-1.9.5.tar.gz) = 03514c618a16b02889db997c6c4789b3436b3ad7d974348d2c6dea53eb78898ab285ce5f10297c074bab4fd2c82931a8b7c5c113b994447a44abb30fca74c715 +SHA512 (findlib-1.9.6.tar.gz) = cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027 From 81e8f9639f4c12052187ae6a3d1994383ff5faee Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 24 Jan 2023 08:50:21 +0000 Subject: [PATCH 03/27] Rebuild OCaml packages for F38 --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 6cbfaf9..d91b72e 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -6,7 +6,7 @@ Name: ocaml-findlib Version: 1.9.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -105,6 +105,9 @@ make install \ %changelog +* Tue Jan 24 2023 Richard W.M. Jones - 1.9.6-2 +- Rebuild OCaml packages for F38 + * Mon Jan 23 2023 Richard W.M. Jones - 1.9.6-1 - New upstream version 1.9.6 From 1a949b42a97d7cd217d81300a1f828d63ce47087 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 10 Jul 2023 14:28:53 -0600 Subject: [PATCH 04/27] 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 --- ocaml-findlib-toolbox.patch | 117 ++++++++++++++++++++++++++++++++++++ ocaml-findlib.spec | 83 ++++++++++++++----------- 2 files changed, 164 insertions(+), 36 deletions(-) create mode 100644 ocaml-findlib-toolbox.patch diff --git a/ocaml-findlib-toolbox.patch b/ocaml-findlib-toolbox.patch new file mode 100644 index 0000000..76f762d --- /dev/null +++ b/ocaml-findlib-toolbox.patch @@ -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(); diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index d91b72e..bdec1fb 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,30 +1,33 @@ -%undefine _package_note_flags -# https://bugzilla.redhat.com/show_bug.cgi?id=2044028 -# https://bugzilla.redhat.com/show_bug.cgi?id=2043092#c21 -# /usr/bin/ld: cannot open linker script file /builddir/build/BUILD/.package_note-ocaml-4.13.1-2.fc36.x86_64.ld: No such file or directory -%undefine _package_note_file +%ifnarch %{ocaml_native_compiler} +# Stripping the binary removes its bytecode payload +%global __strip %{_bindir}/true +%global debug_package %{nil} +%endif Name: ocaml-findlib Version: 1.9.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Objective CAML package manager and build helper License: MIT URL: http://projects.camlcity.org/projects/findlib.html Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz +# Fix the toolbox build with OCaml 5.x +Patch0: %{name}-toolbox.patch + BuildRequires: ocaml >= 4.02.0 BuildRequires: ocaml-labltk-devel -BuildRequires: ocaml-ocamlbuild-devel -#BuildRequires: ocaml-num-devel +BuildRequires: ocaml-ocamlbuild BuildRequires: ocaml-compiler-libs BuildRequires: ocaml-ocamldoc BuildRequires: m4, ncurses-devel -BuildRequires: gawk BuildRequires: make +BuildRequires: python3 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 Ident -i Identifiable -i Load_path -i Location -i Longident -i Misc -i Outcometree -i Parsetree -i Path -i Primitive -i Shape -i Subst -i Topdirs -i Toploop -i Type_immediacy -i Types -i Warnings %description @@ -44,6 +47,17 @@ developing applications that use %{name}. %prep %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 + +# Configure bug? dynlink_subdir is the empty string +sed -i 's/\${dynlink_subdir}/dynlink/' configure + %build ocamlc -version @@ -56,9 +70,9 @@ cat src/findlib/ocaml_args.ml -sitelib `ocamlc -where` \ -mandir %{_mandir} \ -with-toolbox -make all +%make_build all %ifarch %{ocaml_native_compiler} -make opt +%make_build opt %endif rm doc/guide-html/TIMESTAMP @@ -72,39 +86,36 @@ make install \ OCAMLFIND_BIN=%{_bindir} \ OCAMLFIND_MAN=%{_mandir} +# Remove spurious executable bits +chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man{1,5}/* +chmod 0644 $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/*.{cma,cmi,ml,mli,pattern} +chmod 0644 $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/{META,Makefile*} +%ifarch %{ocaml_native_compiler} +chmod 0644 $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/*.{a,cmxa} +%endif -%files +%ocaml_files +sed -i '/ocamlfind\.conf/d' .ofiles + + +%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 -%ifarch %{ocaml_native_compiler} -%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 -# Had to disable this in OCaml 4.06, unclear why. -#%%{_libdir}/ocaml/num-top -%files devel +%files devel -f .ofiles-devel %doc LICENSE doc/README doc/guide-html -%ifarch %{ocaml_native_compiler} -%{_libdir}/ocaml/findlib/*.a -%{_libdir}/ocaml/findlib/*.cmxa -%endif -%{_libdir}/ocaml/findlib/*.mli -%{_libdir}/ocaml/findlib/Makefile.config %changelog +* Mon Jul 10 2023 Jerry James - 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 - 1.9.6-2 - Rebuild OCaml packages for F38 From 2b61fb74d804831cd77164899b1c34e5292ef045 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 11:36:23 +0100 Subject: [PATCH 05/27] ExcludeArch i686 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/) --- ocaml-findlib.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index bdec1fb..1b67815 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,3 +1,6 @@ +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} + %ifnarch %{ocaml_native_compiler} # Stripping the binary removes its bytecode payload %global __strip %{_bindir}/true From 278b327b48e2610673c3cf4e27abf51f59ee070e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 20:15:18 +0100 Subject: [PATCH 06/27] OCaml 5.0 rebuild for Fedora 39 --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 1b67815..a0b088f 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -9,7 +9,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -111,6 +111,9 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Tue Jul 11 2023 Richard W.M. Jones - 1.9.6-4 +- OCaml 5.0 rebuild for Fedora 39 + * Mon Jul 10 2023 Jerry James - 1.9.6-3 - OCaml 5.0.0 rebuild - Verify the License is valid SPDX From 88eec2b4e272da07ed7b37feea99ec11fc80550b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 17:17:33 +0000 Subject: [PATCH 07/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index a0b088f..9ba165e 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -9,7 +9,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -111,6 +111,9 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.9.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Richard W.M. Jones - 1.9.6-4 - OCaml 5.0 rebuild for Fedora 39 From 26cf444068fcaf096301b53f518a4adecdb0aaf2 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 4 Oct 2023 21:14:11 -0600 Subject: [PATCH 08/27] Build an executable that is not damaged by stripping --- ocaml-findlib.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 9ba165e..0950198 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -2,8 +2,6 @@ ExcludeArch: %{ix86} %ifnarch %{ocaml_native_compiler} -# Stripping the binary removes its bytecode payload -%global __strip %{_bindir}/true %global debug_package %{nil} %endif @@ -24,9 +22,9 @@ BuildRequires: ocaml-labltk-devel BuildRequires: ocaml-ocamlbuild BuildRequires: ocaml-compiler-libs BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml-rpm-macros BuildRequires: m4, ncurses-devel BuildRequires: make -BuildRequires: python3 Requires: ocaml # Do not require ocaml-compiler-libs at runtime @@ -61,6 +59,9 @@ sed -i 's,/usr/local/man,%{_mandir},' configure # Configure bug? dynlink_subdir is the empty string sed -i 's/\${dynlink_subdir}/dynlink/' configure +# Build an executable that is not damaged by stripping +sed -i 's/\(custom=\)-custom/\1-output-complete-exe/' configure + %build ocamlc -version @@ -111,6 +112,9 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Wed Oct 4 2023 Jerry James - 1.9.6-5 +- Build an executable that is not damaged by stripping + * Thu Jul 20 2023 Fedora Release Engineering - 1.9.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From c3d92b7a58d90a687d7eb50f77d079c8cf960bba Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Oct 2023 12:18:59 +0100 Subject: [PATCH 09/27] OCaml 5.1 rebuild for Fedora 40 --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 0950198..8a2923f 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -112,6 +112,9 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Thu Oct 05 2023 Richard W.M. Jones - 1.9.6-6 +- OCaml 5.1 rebuild for Fedora 40 + * Wed Oct 4 2023 Jerry James - 1.9.6-5 - Build an executable that is not damaged by stripping From 0f76562aadfbda95884e8b074ea36780d3d9e2b5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Dec 2023 08:47:57 +0000 Subject: [PATCH 10/27] OCaml 5.1.1 rebuild for Fedora 40 --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 8a2923f..63ba2a2 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -112,6 +112,9 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Tue Dec 12 2023 Richard W.M. Jones - 1.9.6-7 +- OCaml 5.1.1 rebuild for Fedora 40 + * Thu Oct 05 2023 Richard W.M. Jones - 1.9.6-6 - OCaml 5.1 rebuild for Fedora 40 From 67571698f34636a8a9389eb6a3531b1a71f50643 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Dec 2023 13:21:47 +0000 Subject: [PATCH 11/27] OCaml 5.1.1 + s390x code gen fix for Fedora 40 --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 63ba2a2..ae9ed1b 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -112,6 +112,9 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Mon Dec 18 2023 Richard W.M. Jones - 1.9.6-8 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + * Tue Dec 12 2023 Richard W.M. Jones - 1.9.6-7 - OCaml 5.1.1 rebuild for Fedora 40 From f184034a96ce19d76a3ef5b7f51a37f65bf52f2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 10:16:15 +0000 Subject: [PATCH 12/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index ae9ed1b..eb51586 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -112,6 +112,9 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.9.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 18 2023 Richard W.M. Jones - 1.9.6-8 - OCaml 5.1.1 + s390x code gen fix for Fedora 40 From 85085437af9b5fe6582b5a87f2664886feb2da6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 09:59:16 +0000 Subject: [PATCH 13/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index eb51586..898719d 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -112,6 +112,9 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.9.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.9.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6eaef8225a16ceb5b7b81ce6c2fcb5bbdbe9afdb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Jan 2024 22:04:09 +0000 Subject: [PATCH 14/27] Bump and rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 898719d..f589323 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.6 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -112,6 +112,9 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Mon Jan 29 2024 Richard W.M. Jones - 1.9.6-11 +- Bump and rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 1.9.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e8351d91e376366974df0ff4b818982c4a4e3b80 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 23 May 2024 09:23:21 -0600 Subject: [PATCH 15/27] Skip broken test for ocamlopt -g --- ocaml-findlib.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index f589323..8acd024 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -12,6 +12,7 @@ Summary: Objective CAML package manager and build helper License: MIT URL: http://projects.camlcity.org/projects/findlib.html +VCS: https://github.com/ocaml/ocamlfind Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz # Fix the toolbox build with OCaml 5.x @@ -62,6 +63,9 @@ sed -i 's/\${dynlink_subdir}/dynlink/' 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 ocamlc -version From f2a4218c0c9319f9efad45a45815ccaac0c81a5f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 29 May 2024 17:33:35 +0100 Subject: [PATCH 16/27] OCaml 5.2.0 for Fedora 41 --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 8acd024..6d89d93 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.6 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -116,6 +116,9 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Wed May 29 2024 Richard W.M. Jones - 1.9.6-12 +- OCaml 5.2.0 for Fedora 41 + * Mon Jan 29 2024 Richard W.M. Jones - 1.9.6-11 - Bump and rebuild From dc90075ef1dc97df9b6d94ae35976f12a884a598 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 11:39:51 +0100 Subject: [PATCH 17/27] OCaml 5.2.0 ppc64le fix --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 6d89d93..d4119f9 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.6 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -116,6 +116,9 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Wed Jun 19 2024 Richard W.M. Jones - 1.9.6-13 +- OCaml 5.2.0 ppc64le fix + * Wed May 29 2024 Richard W.M. Jones - 1.9.6-12 - OCaml 5.2.0 for Fedora 41 From f029a3cf43b8b77520e48b4c26775ba5b0511a6b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 13:46:04 +0100 Subject: [PATCH 18/27] Add RHEL gating test --- gating.yaml | 6 ++++++ tests/basic-test.sh | 7 +++++++ tests/tests.yml | 12 ++++++++++++ 3 files changed, 25 insertions(+) create mode 100755 gating.yaml create mode 100755 tests/basic-test.sh create mode 100755 tests/tests.yml diff --git a/gating.yaml b/gating.yaml new file mode 100755 index 0000000..2c7ed80 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/tests/basic-test.sh b/tests/basic-test.sh new file mode 100755 index 0000000..cf3c2e3 --- /dev/null +++ b/tests/basic-test.sh @@ -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 diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100755 index 0000000..49cfb7f --- /dev/null +++ b/tests/tests.yml @@ -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 From 6409759442e76cd3a6d7ac9c1a832c5f38dfc0ea Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Jul 2024 13:58:36 -0600 Subject: [PATCH 19/27] Fix the VCS field --- ocaml-findlib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index d4119f9..87f66e9 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -12,7 +12,7 @@ Summary: Objective CAML package manager and build helper License: MIT URL: http://projects.camlcity.org/projects/findlib.html -VCS: https://github.com/ocaml/ocamlfind +VCS: git:https://github.com/ocaml/ocamlfind.git Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz # Fix the toolbox build with OCaml 5.x From 73c23efe295137ff919b608049cc7da431081514 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:06:58 +0000 Subject: [PATCH 20/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 87f66e9..bb5c219 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -116,6 +116,9 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.9.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 19 2024 Richard W.M. Jones - 1.9.6-13 - OCaml 5.2.0 ppc64le fix From 58f1cf08af728a65cc82b27eba9c54c883d49caf Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 26 Dec 2024 20:07:22 -0700 Subject: [PATCH 21/27] 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 --- .gitignore | 1 + ocaml-findlib.spec | 38 ++++++++++++++++---------------------- sources | 2 +- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 02a869b..9e37fe9 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ findlib-1.2.5.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 diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index bb5c219..7d5df70 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -6,8 +6,8 @@ ExcludeArch: %{ix86} %endif Name: ocaml-findlib -Version: 1.9.6 -Release: 14%{?dist} +Version: 1.9.8 +Release: 1%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -29,7 +29,7 @@ BuildRequires: make Requires: ocaml # 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 Ident -i Identifiable -i Load_path -i Location -i Longident -i Misc -i Outcometree -i Parsetree -i Path -i Primitive -i Shape -i Subst -i Topdirs -i Toploop -i Type_immediacy -i Types -i Warnings +%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 @@ -57,9 +57,6 @@ mv doc/README.utf8 doc/README # Fix the OCaml core man directory sed -i 's,/usr/local/man,%{_mandir},' configure -# Configure bug? dynlink_subdir is the empty string -sed -i 's/\${dynlink_subdir}/dynlink/' configure - # Build an executable that is not damaged by stripping sed -i 's/\(custom=\)-custom/\1-output-complete-exe/' configure @@ -73,7 +70,7 @@ 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} \ @@ -86,29 +83,20 @@ 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} - -# Remove spurious executable bits -chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man{1,5}/* -chmod 0644 $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/*.{cma,cmi,ml,mli,pattern} -chmod 0644 $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/{META,Makefile*} -%ifarch %{ocaml_native_compiler} -chmod 0644 $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/*.{a,cmxa} -%endif +rmdir $RPM_BUILD_ROOT%{_mandir}/man3 %ocaml_files -sed -i '/ocamlfind\.conf/d' .ofiles +sed -i '/etc/d' .ofiles %files -f .ofiles %doc LICENSE doc/README -%config(noreplace) %{_sysconfdir}/ocamlfind.conf +%config(noreplace) %{_sysconfdir}/findlib.conf %files devel -f .ofiles-devel @@ -116,6 +104,12 @@ sed -i '/ocamlfind\.conf/d' .ofiles %changelog +* Thu Dec 19 2024 Jerry James - 1.9.8-1 +- 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 - 1.9.6-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 91ef8e4..d5baf22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (findlib-1.9.6.tar.gz) = cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027 +SHA512 (findlib-1.9.8.tar.gz) = 64aa28ac27358e1bc5d118e283fb64757fb96329151860bb9c1e9352a9fa1728ebcb4320b8d2eeb57ed2eea83c9849ea89d06c0fa25e1884ececb431341f9f1a From b11d2d2f2fae686a99924ec38f1a021f4a6ac7b4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 9 Jan 2025 10:15:11 -0700 Subject: [PATCH 22/27] OCaml 5.3.0 rebuild for Fedora 42 --- ocaml-findlib.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 7d5df70..d209a80 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -104,7 +104,8 @@ sed -i '/etc/d' .ofiles %changelog -* Thu Dec 19 2024 Jerry James - 1.9.8-1 +* Thu Jan 9 2025 Jerry James - 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 From 550c7d394e2d747585ac1bedda398bb9f4683413 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 20:49:40 +0000 Subject: [PATCH 23/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index d209a80..4939e26 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -104,6 +104,9 @@ sed -i '/etc/d' .ofiles %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.9.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 9 2025 Jerry James - 1.9.8-1 - OCaml 5.3.0 rebuild for Fedora 42 - Version 1.9.8 From 9033149637e22d0d4309ad230be0c3389b14c44b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 11 Jul 2025 10:38:37 -0600 Subject: [PATCH 24/27] Rebuild to fix OCaml dependencies --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 4939e26..210636b 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -104,6 +104,9 @@ sed -i '/etc/d' .ofiles %changelog +* Fri Jul 11 2025 Jerry James - 1.9.8-3 +- Rebuild to fix OCaml dependencies + * Fri Jan 17 2025 Fedora Release Engineering - 1.9.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4cc60c6533e92ff77d07ab257a998e449b6c5f89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:10:54 +0000 Subject: [PATCH 25/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 210636b..6eb5db8 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -104,6 +104,9 @@ sed -i '/etc/d' .ofiles %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.9.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 11 2025 Jerry James - 1.9.8-3 - Rebuild to fix OCaml dependencies From 7d01903ff78ab6a5790c3959c493d3e0ef07045d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Oct 2025 12:52:55 +0100 Subject: [PATCH 26/27] OCaml 5.4.0 rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 6eb5db8..f00b7e6 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: ocaml-findlib Version: 1.9.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -104,6 +104,9 @@ sed -i '/etc/d' .ofiles %changelog +* Mon Oct 13 2025 Richard W.M. Jones - 1.9.8-5 +- OCaml 5.4.0 rebuild + * Thu Jul 24 2025 Fedora Release Engineering - 1.9.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From eea7434021e5c929440e4d14dac6493ad157f854 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 13 Jan 2026 16:24:29 -0700 Subject: [PATCH 27/27] Fix a changelog entry --- ocaml-findlib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index f00b7e6..bd818f1 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -110,7 +110,7 @@ sed -i '/etc/d' .ofiles * Thu Jul 24 2025 Fedora Release Engineering - 1.9.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Fri Jul 11 2025 Jerry James - 1.9.8-3 +* Fri Jul 11 2025 Jerry James - 1.9.8-3 - Rebuild to fix OCaml dependencies * Fri Jan 17 2025 Fedora Release Engineering - 1.9.8-2