From fbe3fc62a28de31da1846fcfa0b6855074d4d348 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Tue, 28 Jan 2025 16:26:33 -0700
Subject: [PATCH] OCaml 5.2.1 rebuild for Fedora 41

- Version 1.9.8
- Drop workaround for upstream dynlink_subdir bug
- Change config name to findlib.conf to match upstream
---
 .gitignore         |  1 +
 ocaml-findlib.spec | 36 +++++++++++++++---------------------
 sources            |  2 +-
 3 files changed, 17 insertions(+), 22 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..47e622f 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
 
@@ -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
+* Tue Jan 28 2025 Jerry James <loganjerry@gmail.com> - 1.9.8-1
+- OCaml 5.2.1 rebuild for Fedora 41
+- Version 1.9.8
+- Drop workaround for upstream dynlink_subdir bug
+- Change config name to findlib.conf to match upstream
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 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