From 58f1cf08af728a65cc82b27eba9c54c883d49caf Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 26 Dec 2024 20:07:22 -0700 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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