.gitignore

@@ -11,6 +11,3 @@ findlib-1.2.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.4-add-debug.patch

@@ -0,0 +1,11 @@
+--- ./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 --

ocaml-findlib.spec

@@ -1,16 +1,29 @@
+%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
+%global debug_package %{nil}
+%endif
+
+
 Name:           ocaml-findlib
-Version:        1.8.1
-Release:        21%{?dist}
+Version:        1.7.1
+Release:        2%{?dist}
 Summary:        Objective CAML package manager and build helper
 License:        BSD
 
 URL:            http://projects.camlcity.org/projects/findlib.html
 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
+
 BuildRequires:  ocaml >= 4.02.0
+BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-labltk-devel
 BuildRequires:  ocaml-ocamlbuild-devel
-#BuildRequires:  ocaml-num-devel
 BuildRequires:  ocaml-compiler-libs
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  m4, ncurses-devel
@@ -36,6 +49,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n findlib-%{version}
+%patch1 -p2
 
 
 %build
@@ -50,7 +64,7 @@ cat src/findlib/ocaml_args.ml
   -mandir %{_mandir} \
   -with-toolbox
 make all
-%ifarch %{ocaml_native_compiler}
+%if %opt
 make opt
 %endif
 rm doc/guide-html/TIMESTAMP
@@ -75,7 +89,7 @@ make install \
 %{_libdir}/ocaml/*/META
 %{_libdir}/ocaml/topfind
 %{_libdir}/ocaml/findlib
-%ifarch %{ocaml_native_compiler}
+%if %opt
 %exclude %{_libdir}/ocaml/findlib/*.a
 %exclude %{_libdir}/ocaml/findlib/*.cmxa
 %endif
@@ -83,13 +97,12 @@ make install \
 %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
+%{_libdir}/ocaml/num-top
 
 
 %files devel
 %doc LICENSE doc/README doc/guide-html
-%ifarch %{ocaml_native_compiler}
+%if %opt
 %{_libdir}/ocaml/findlib/*.a
 %{_libdir}/ocaml/findlib/*.cmxa
 %endif
@@ -98,132 +111,6 @@ make install \
 
 
 %changelog
-* 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
 

sources

@@ -1 +1 @@
-SHA512 (findlib-1.8.1.tar.gz) = 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
+108717618e724295d8a01c21ba3f7311  findlib-1.7.1.tar.gz