New upstream version 1.2.8.

(cherry picked from commit 1d26ec4541)

.gitignore

@@ -2,15 +2,3 @@ findlib-1.2.5.tar.gz
 /findlib-1.2.6.tar.gz
 /findlib-1.2.7.tar.gz
 /findlib-1.2.8.tar.gz
-/findlib-1.3.1.tar.gz
-/findlib-1.3.3.tar.gz
-/findlib-1.4.tar.gz
-/findlib-1.5.1.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

ocaml-findlib.spec

@@ -1,17 +1,24 @@
-Name:           ocaml-findlib
-Version:        1.8.1
-Release:        21%{?dist}
-Summary:        Objective CAML package manager and build helper
-License:        BSD
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global debug_package %{nil}
+%if !%opt
+%global __strip /bin/true
+%endif
 
+Name:           ocaml-findlib
+Version:        1.2.8
+Release:        1%{?dist}
+Summary:        Objective CAML package manager and build helper
+
+Group:          Development/Libraries
+License:        BSD
 URL:            http://projects.camlcity.org/projects/findlib.html
 Source0:        http://download.camlcity.org/download/findlib-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
-BuildRequires:  ocaml >= 4.02.0
+BuildRequires:  ocaml >= 3.12.0-3
+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
 BuildRequires:  gawk
@@ -26,6 +33,7 @@ Objective CAML package manager and build helper.
 
 %package        devel
 Summary:        Development files for %{name}
+Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -50,23 +58,38 @@ 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
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 # Grrr destdir grrrr
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5}
-make install \
-     prefix=$RPM_BUILD_ROOT \
-     OCAMLFIND_BIN=%{_bindir} \
-     OCAMLFIND_MAN=%{_mandir}
+make install prefix=$RPM_BUILD_ROOT OCAMLFIND_BIN=$RPM_BUILD_ROOT%{_bindir}
+mv $RPM_BUILD_ROOT/$RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_bindir}
+
+%if %opt
+strip $RPM_BUILD_ROOT%{_bindir}/ocamlfind
+%endif
+
+# If ocamlfind is bytecode, don't strip it and prevent prelink from
+# stripping it as well (RHBZ#435559).
+%if !%opt
+mkdir -p $RPM_BUILD_ROOT/etc/prelink.conf.d
+echo '-b /usr/bin/ocamlfind' \
+  > $RPM_BUILD_ROOT/etc/prelink.conf.d/ocaml-ocamlfind.conf
+%endif
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
+%defattr(-,root,root,-)
 %doc LICENSE doc/README
 %config(noreplace) %{_sysconfdir}/ocamlfind.conf
 %{_bindir}/*
@@ -75,7 +98,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,256 +106,26 @@ 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
+%if !%opt
+%config(noreplace) %{_sysconfdir}/prelink.conf.d/ocaml-ocamlfind.conf
+%endif
 
 
 %files devel
+%defattr(-,root,root,-)
 %doc LICENSE doc/README doc/guide-html
-%ifarch %{ocaml_native_compiler}
+%if %opt
 %{_libdir}/ocaml/findlib/*.a
 %{_libdir}/ocaml/findlib/*.cmxa
 %endif
 %{_libdir}/ocaml/findlib/*.mli
 %{_libdir}/ocaml/findlib/Makefile.config
+%{_libdir}/ocaml/findlib/make_wizard
+%{_libdir}/ocaml/findlib/make_wizard.pattern
 
 
 %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
-
-* 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.
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.5.5-7
-- OCaml 4.02.3 rebuild.
-
-* Wed Jul 22 2015 Richard W.M. Jones <rjones@redhat.com> - 1.5.5-6
-- s/390x: Disable debuginfo generation (which strips binaries) when building
-  bytecode.
-
-* Fri Jul 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.5.5-5
-- s/390x: Don't strip the ocamlfind binary when building bytecode.
-
-* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.5.5-4
-- ocaml-4.02.2 final rebuild.
-
-* Wed Jun 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.5.5-3
-- Bump release and rebuild for ocaml-4.02.2
-
-* Mon Feb 16 2015 Richard W.M. Jones <rjones@redhat.com> - 1.5.5-2
-- Bump release and rebuild.
-
-* Mon Feb 16 2015 Richard W.M. Jones <rjones@redhat.com> - 1.5.5-1
-- New upstream version 1.5.5 for ocaml-4.02.1 rebuild.
-
-* Sat Aug 30 2014 Richard W.M. Jones <rjones@redhat.com> - 1.5.2-3
-- Bump release and rebuild.
-
-* Sat Aug 30 2014 Richard W.M. Jones <rjones@redhat.com> - 1.5.2-2
-- ocaml-4.02.0 final rebuild.
-
-* Fri Aug 22 2014 Richard W.M. Jones <rjones@redhat.com> - 1.5.2-1
-- New upstream release 1.5.2.
-- ocaml-4.02.0+rc1 rebuild.
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Fri Aug 01 2014 Richard W.M. Jones <rjones@redhat.com> - 1.5.1-3
-- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
-
-* Thu Jul 17 2014 Richard W.M. Jones <rjones@redhat.com> - 1.5.1-2
-- Rebuild for new camlp4 package for OCaml 4.02.0 beta rebuild.
-
-* Sat Jul 12 2014 Richard W.M. Jones <rjones@redhat.com> - 1.5.1-1
-- New upstream version 1.5.1.
-- Disable labltk and camlp4.  We will reenable when they are added back
-  into Fedora.
-- Remove findlib/make_wizard and findlib/make_wizard.pattern.
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed May 28 2014 Dan Horák <dan[at]danny.cz> - 1.4-2
-- drop ExcludeArch
-
-* Fri Sep 13 2013 Richard W.M. Jones <rjones@redhat.com> - 1.4-1
-- New upstream version 1.4.
-- Build debuginfo.
-- Add -g option when running ocamlopt to generate debuginfo.
-- Don't need anti-prelink / stripping hacks for modern OCaml.
-- Modernize spec file.
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Nov 27 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-3
-- BR >= OCaml 4.00.1 so we can't build against the wrong OCaml version.
-
-* Tue Oct 16 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-2
-- Rebuild for OCaml 4.00.1.
-
-* Sat Jul 28 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-1
-- New upstream version 1.3.3.
-- Remove patch for OCaml 4 which has been obsoleted by upstream changes.
-
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Jun 10 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-2
-- Rebuild for OCaml 4.00.0.
-
-* Thu Jun  7 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-1
-- New upstream version 1.3.1.
-- This is required for programs using findlib and OCaml 4.00.0.
-- Add small patch to fix build of topfind.
-
 * Sat Apr 28 2012 Richard W.M. Jones <rjones@redhat.com> - 1.2.8-1
 - New upstream version 1.2.8.
 
@@ -388,7 +181,7 @@ make install \
 * Wed Nov 26 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-3
 - Rebuild for OCaml 3.11.0+rc1.
 
-* Fri Nov 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-2
+* Fri Nov 20 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-2
 - Force rebuild.
 
 * Thu Nov 20 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-1

sources

@@ -1 +1 @@
-SHA512 (findlib-1.8.1.tar.gz) = 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
+a1da0fddf589ae62fa9b50799cd04c17  findlib-1.2.8.tar.gz