From ce08e5bc15a46d1127569a0111f0df33d4e34f9e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 10 May 2017 14:46:57 +0100 Subject: [PATCH 01/95] Rebuild for OCaml 4.04.1. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 3f9cb4e..0ea7b2a 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -10,7 +10,7 @@ Name: ocaml-findlib Version: 1.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -111,6 +111,9 @@ make install \ %changelog +* Wed May 10 2017 Richard W.M. Jones - 1.7.1-3 +- Rebuild for OCaml 4.04.1. + * Sat Feb 11 2017 Fedora Release Engineering - 1.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 733bdde22874b62fc48c1b156de9344a35de39d9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 5 Jun 2017 21:23:34 +0100 Subject: [PATCH 02/95] New upstream version 1.7.3. --- .gitignore | 1 + ocaml-findlib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2164755..4867aed 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ 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 diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 0ea7b2a..3445c64 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -9,8 +9,8 @@ Name: ocaml-findlib -Version: 1.7.1 -Release: 3%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -111,6 +111,9 @@ make install \ %changelog +* Mon Jun 5 2017 Richard W.M. Jones - 1.7.3-1 +- New upstream version 1.7.3. + * Wed May 10 2017 Richard W.M. Jones - 1.7.1-3 - Rebuild for OCaml 4.04.1. diff --git a/sources b/sources index f5dff30..0875d49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -108717618e724295d8a01c21ba3f7311 findlib-1.7.1.tar.gz +SHA512 (findlib-1.7.3.tar.gz) = 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886 From 8441a23cb29938bddfa58a260e1bf3e5731cc9b9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 26 Jun 2017 16:33:56 +0100 Subject: [PATCH 03/95] OCaml 4.04.2 rebuild. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 3445c64..f85de0b 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -10,7 +10,7 @@ Name: ocaml-findlib Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -111,6 +111,9 @@ make install \ %changelog +* Mon Jun 26 2017 Richard W.M. Jones - 1.7.3-2 +- OCaml 4.04.2 rebuild. + * Mon Jun 5 2017 Richard W.M. Jones - 1.7.3-1 - New upstream version 1.7.3. From 957b9bf2c62205573a17e82c6592e05bb518a872 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 01:28:12 +0000 Subject: [PATCH 04/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index f85de0b..e029e00 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -10,7 +10,7 @@ Name: ocaml-findlib Version: 1.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -111,6 +111,9 @@ make install \ %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Jun 26 2017 Richard W.M. Jones - 1.7.3-2 - OCaml 4.04.2 rebuild. From b4bc4d2e9f799a057354ab26525774da1258f4ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 04:15:49 +0000 Subject: [PATCH 05/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index e029e00..96d7996 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -10,7 +10,7 @@ Name: ocaml-findlib Version: 1.7.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -111,6 +111,9 @@ make install \ %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.7.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From f856abc6ed35ccf1d1d0a0c6c382780bd36d64d0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 7 Aug 2017 16:50:10 +0100 Subject: [PATCH 06/95] OCaml 4.05.0 rebuild. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 96d7996..5eb2b5b 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -10,7 +10,7 @@ Name: ocaml-findlib Version: 1.7.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -111,6 +111,9 @@ make install \ %changelog +* Mon Aug 07 2017 Richard W.M. Jones - 1.7.3-5 +- OCaml 4.05.0 rebuild. + * Thu Aug 03 2017 Fedora Release Engineering - 1.7.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From cd5ddbb0b64ed8aae0a46a91c21703732e36f9e1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 22 Sep 2017 10:53:37 +0100 Subject: [PATCH 07/95] Enable stripping and debuginfo on s390x. Use ocaml_native_compiler macro instead of opt test. --- ocaml-findlib.spec | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 5eb2b5b..2dd807e 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,16 +1,6 @@ -%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.7.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -64,7 +54,7 @@ cat src/findlib/ocaml_args.ml -mandir %{_mandir} \ -with-toolbox make all -%if %opt +%ifarch %{ocaml_native_compiler} make opt %endif rm doc/guide-html/TIMESTAMP @@ -89,7 +79,7 @@ make install \ %{_libdir}/ocaml/*/META %{_libdir}/ocaml/topfind %{_libdir}/ocaml/findlib -%if %opt +%ifarch %{ocaml_native_compiler} %exclude %{_libdir}/ocaml/findlib/*.a %exclude %{_libdir}/ocaml/findlib/*.cmxa %endif @@ -102,7 +92,7 @@ make install \ %files devel %doc LICENSE doc/README doc/guide-html -%if %opt +%ifarch %{ocaml_native_compiler} %{_libdir}/ocaml/findlib/*.a %{_libdir}/ocaml/findlib/*.cmxa %endif @@ -111,6 +101,10 @@ make install \ %changelog +* Fri Sep 22 2017 Richard W.M. Jones - 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 - 1.7.3-5 - OCaml 4.05.0 rebuild. From 711fbdce5943c9d05b3f792ab9666807940a5857 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 Nov 2017 21:38:57 +0000 Subject: [PATCH 08/95] OCaml 4.06.0 rebuild. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 2dd807e..2e0af9a 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.7.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -101,6 +101,9 @@ make install \ %changelog +* Tue Nov 07 2017 Richard W.M. Jones - 1.7.3-7 +- OCaml 4.06.0 rebuild. + * Fri Sep 22 2017 Richard W.M. Jones - 1.7.3-6 - Enable stripping and debuginfo on s390x. - Use ocaml_native_compiler macro instead of opt test. From 92d2cdf5eb2386dc4043ef1813530c0a1b25aaec Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 Nov 2017 22:00:52 +0000 Subject: [PATCH 09/95] Upstream patch to fix detection of "num" package. --- ...reinstallation-of-num-for-ocaml-4.06.patch | 47 +++++++++++++++++++ ocaml-findlib.spec | 4 ++ 2 files changed, 51 insertions(+) create mode 100644 findlib-fix-reinstallation-of-num-for-ocaml-4.06.patch diff --git a/findlib-fix-reinstallation-of-num-for-ocaml-4.06.patch b/findlib-fix-reinstallation-of-num-for-ocaml-4.06.patch new file mode 100644 index 0000000..5bbe66e --- /dev/null +++ b/findlib-fix-reinstallation-of-num-for-ocaml-4.06.patch @@ -0,0 +1,47 @@ +diff --git a/configure b/configure +index 6a4a558..3f99074 100755 +--- a/configure ++++ b/configure +@@ -514,7 +514,10 @@ fi + + # dbm? + +-if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then ++if [ -f "${ocaml_sitelib}/dbm/META" ]; then ++ echo "dbm: package already present" ++ ldbm="" ++elif [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then + echo "dbm: found" + ldbm="dbm" + else +@@ -524,8 +527,12 @@ fi + + # num? + +-if [ -f "${ocaml_core_stdlib}/num.cmi" ]; then +- echo "num: found" ++if [ -f "${ocaml_sitelib}/num/META" ]; then ++ echo "num: package already present" ++ lnum="" ++ numtop="" ++elif [ -f "${ocaml_core_stdlib}/num.cmi" ]; then ++ echo "num: found but not as package" + lnum="num num-top" + numtop="num-top" + else +diff --git a/doc/README.xml b/doc/README.xml +index 248483e..0b2b3b5 100644 +--- a/doc/README.xml ++++ b/doc/README.xml +@@ -110,6 +110,11 @@ configuration files, and library routines in detail.

+
    + +
  • ++

    git version: Fix reinstallation of "num" for OCaml-4.06. ++

    ++
    • ++ ++
  • +

    1.7.3: Fix regarding num-top: this library is now also + optional, as num.

    +
    • diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 2e0af9a..e082702 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -10,6 +10,9 @@ 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 +# Upstream patch to fix detection of "num" package. +Patch2: findlib-fix-reinstallation-of-num-for-ocaml-4.06.patch + BuildRequires: ocaml >= 4.02.0 BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-labltk-devel @@ -40,6 +43,7 @@ developing applications that use %{name}. %prep %setup -q -n findlib-%{version} %patch1 -p2 +%patch2 -p1 %build From 73e1f4383d7fce9acd883334c9f878c0069c3f34 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 Nov 2017 22:02:23 +0000 Subject: [PATCH 10/95] Disable num-top subpackage (why?) --- ocaml-findlib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index e082702..c5c9bdb 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -91,7 +91,7 @@ make install \ %exclude %{_libdir}/ocaml/findlib/Makefile.config %exclude %{_libdir}/ocaml/findlib/make_wizard %exclude %{_libdir}/ocaml/findlib/make_wizard.pattern -%{_libdir}/ocaml/num-top +#%{_libdir}/ocaml/num-top %files devel From e583bf52e8817ad3dcd687ba6a95a69d9a2f9405 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 8 Nov 2017 14:31:49 +0000 Subject: [PATCH 11/95] BR ocaml-num-devel (unfortunately a circular dependency). --- ocaml-findlib.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index c5c9bdb..63e7935 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.7.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -17,6 +17,7 @@ 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 @@ -105,6 +106,9 @@ make install \ %changelog +* Wed Nov 08 2017 Richard W.M. Jones - 1.7.3-8 +- BR ocaml-num-devel (unfortunately a circular dependency). + * Tue Nov 07 2017 Richard W.M. Jones - 1.7.3-7 - OCaml 4.06.0 rebuild. From f81be34920e9fa6b65cd7c33029cc227f94ecb54 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 8 Nov 2017 14:32:43 +0000 Subject: [PATCH 12/95] And reenable num-top package. This reverts commit 73e1f4383d7fce9acd883334c9f878c0069c3f34. --- ocaml-findlib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 63e7935..c2274ab 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -92,7 +92,7 @@ make install \ %exclude %{_libdir}/ocaml/findlib/Makefile.config %exclude %{_libdir}/ocaml/findlib/make_wizard %exclude %{_libdir}/ocaml/findlib/make_wizard.pattern -#%{_libdir}/ocaml/num-top +%{_libdir}/ocaml/num-top %files devel From a8fb85be4393ead2d91a548402a7552e7a852b7c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 8 Nov 2017 14:38:21 +0000 Subject: [PATCH 13/95] Disable num package again as it still doesn't work. --- ocaml-findlib.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index c2274ab..a7bff97 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -17,7 +17,7 @@ BuildRequires: ocaml >= 4.02.0 BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-labltk-devel BuildRequires: ocaml-ocamlbuild-devel -BuildRequires: ocaml-num-devel +#BuildRequires: ocaml-num-devel BuildRequires: ocaml-compiler-libs BuildRequires: ocaml-ocamldoc BuildRequires: m4, ncurses-devel @@ -92,7 +92,8 @@ make install \ %exclude %{_libdir}/ocaml/findlib/Makefile.config %exclude %{_libdir}/ocaml/findlib/make_wizard %exclude %{_libdir}/ocaml/findlib/make_wizard.pattern -%{_libdir}/ocaml/num-top +# Had to disable this in OCaml 4.06, unclear why. +#%%{_libdir}/ocaml/num-top %files devel From 3f25a1dfa0b0551fea94c0ba5b75960c9dcc6d29 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 8 Nov 2017 14:41:58 +0000 Subject: [PATCH 14/95] Bump release and rebuild. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index a7bff97..390a352 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.7.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -107,6 +107,9 @@ make install \ %changelog +* Wed Nov 08 2017 Richard W.M. Jones - 1.7.3-9 +- Bump release and rebuild. + * Wed Nov 08 2017 Richard W.M. Jones - 1.7.3-8 - BR ocaml-num-devel (unfortunately a circular dependency). From bcaab7341b6e669c78f01c3dc024a6d445c9280b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 08:50:18 +0000 Subject: [PATCH 15/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 390a352..0e45384 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.7.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -107,6 +107,9 @@ make install \ %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 1.7.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Nov 08 2017 Richard W.M. Jones - 1.7.3-9 - Bump release and rebuild. From e4ce403f6b517b57b029b011536889311c6b61c8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 26 Apr 2018 14:26:34 +0100 Subject: [PATCH 16/95] Update to findlib 1.8.0. - Remove upstream patches. --- .gitignore | 1 + findlib-1.4-add-debug.patch | 11 ----- ...reinstallation-of-num-for-ocaml-4.06.patch | 47 ------------------- ocaml-findlib.spec | 16 +++---- sources | 2 +- 5 files changed, 8 insertions(+), 69 deletions(-) delete mode 100644 findlib-1.4-add-debug.patch delete mode 100644 findlib-fix-reinstallation-of-num-for-ocaml-4.06.patch diff --git a/.gitignore b/.gitignore index 4867aed..c900bf2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ findlib-1.2.5.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 diff --git a/findlib-1.4-add-debug.patch b/findlib-1.4-add-debug.patch deleted file mode 100644 index 8734d78..0000000 --- a/findlib-1.4-add-debug.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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 -- diff --git a/findlib-fix-reinstallation-of-num-for-ocaml-4.06.patch b/findlib-fix-reinstallation-of-num-for-ocaml-4.06.patch deleted file mode 100644 index 5bbe66e..0000000 --- a/findlib-fix-reinstallation-of-num-for-ocaml-4.06.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/configure b/configure -index 6a4a558..3f99074 100755 ---- a/configure -+++ b/configure -@@ -514,7 +514,10 @@ fi - - # dbm? - --if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then -+if [ -f "${ocaml_sitelib}/dbm/META" ]; then -+ echo "dbm: package already present" -+ ldbm="" -+elif [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then - echo "dbm: found" - ldbm="dbm" - else -@@ -524,8 +527,12 @@ fi - - # num? - --if [ -f "${ocaml_core_stdlib}/num.cmi" ]; then -- echo "num: found" -+if [ -f "${ocaml_sitelib}/num/META" ]; then -+ echo "num: package already present" -+ lnum="" -+ numtop="" -+elif [ -f "${ocaml_core_stdlib}/num.cmi" ]; then -+ echo "num: found but not as package" - lnum="num num-top" - numtop="num-top" - else -diff --git a/doc/README.xml b/doc/README.xml -index 248483e..0b2b3b5 100644 ---- a/doc/README.xml -+++ b/doc/README.xml -@@ -110,6 +110,11 @@ configuration files, and library routines in detail.

    -
      - -
    • -+

      git version: Fix reinstallation of "num" for OCaml-4.06. -+

      -+
      • -+ -+
    • -

      1.7.3: Fix regarding num-top: this library is now also - optional, as num.

      -
      • diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 0e45384..a1fb842 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,18 +1,12 @@ Name: ocaml-findlib -Version: 1.7.3 -Release: 10%{?dist} +Version: 1.8.0 +Release: 1%{?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 - -# Upstream patch to fix detection of "num" package. -Patch2: findlib-fix-reinstallation-of-num-for-ocaml-4.06.patch - BuildRequires: ocaml >= 4.02.0 BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-labltk-devel @@ -43,8 +37,6 @@ developing applications that use %{name}. %prep %setup -q -n findlib-%{version} -%patch1 -p2 -%patch2 -p1 %build @@ -107,6 +99,10 @@ make install \ %changelog +* Thu Apr 26 2018 Richard W.M. Jones - 1.8.0-1 +- Update to findlib 1.8.0. +- Remove upstream patches. + * Thu Feb 08 2018 Fedora Release Engineering - 1.7.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 0875d49..daffd68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (findlib-1.7.3.tar.gz) = 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886 +SHA512 (findlib-1.8.0.tar.gz) = a6dbfd172bff20ebf05db8a0a952a9f0dc67f9420b89771dbfc6193a7a2e5fe448c9d3bdcc113591175906644299529ef937652cfb2c17f67ec2c4dbb1d71e48 From da7cbaa7ba0f87b791ab3fb146573b73d013a8f3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 19 Jun 2018 20:11:29 +0100 Subject: [PATCH 17/95] OCaml 4.07.0-rc1 rebuild. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index a1fb842..bb31547 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Tue Jun 19 2018 Richard W.M. Jones - 1.8.0-2 +- OCaml 4.07.0-rc1 rebuild. + * Thu Apr 26 2018 Richard W.M. Jones - 1.8.0-1 - Update to findlib 1.8.0. - Remove upstream patches. From 3f237d48d3ab9effe31ffce6d40f9f5868b1fce1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 11 Jul 2018 12:30:13 +0100 Subject: [PATCH 18/95] OCaml 4.07.0 (final) rebuild. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index bb31547..d50b800 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Wed Jul 11 2018 Richard W.M. Jones - 1.8.0-3 +- OCaml 4.07.0 (final) rebuild. + * Tue Jun 19 2018 Richard W.M. Jones - 1.8.0-2 - OCaml 4.07.0-rc1 rebuild. From 6fdcba03ce174fe051564a7b721409d026668642 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 14:43:30 +0000 Subject: [PATCH 19/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 d50b800..33fb596 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jul 11 2018 Richard W.M. Jones - 1.8.0-3 - OCaml 4.07.0 (final) rebuild. From f957fa08475115cfa2c291b6fba1e1dffffa044c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 16:50:07 +0000 Subject: [PATCH 20/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 33fb596..15dcc39 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From acebfa162d6684c022d65f520d28e2508ae2816e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Apr 2019 17:45:59 +0100 Subject: [PATCH 21/95] Disable ocaml-camlp4 dependency until ported to 4.08. --- ocaml-findlib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 15dcc39..7b7cb65 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -8,7 +8,7 @@ URL: http://projects.camlcity.org/projects/findlib.html Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz BuildRequires: ocaml >= 4.02.0 -BuildRequires: ocaml-camlp4-devel +#BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-labltk-devel BuildRequires: ocaml-ocamlbuild-devel #BuildRequires: ocaml-num-devel @@ -99,6 +99,9 @@ make install \ %changelog +* Mon Apr 29 2019 Richard W.M. Jones - 1.8.0-6 +- Disable ocaml-camlp4 dependency until ported to 4.08. + * Fri Feb 01 2019 Fedora Release Engineering - 1.8.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 3f3706af230f361bf21272dc74993d151a1aa5a0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Apr 2019 17:50:31 +0100 Subject: [PATCH 22/95] OCaml 4.08.0 (beta 3) rebuild. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 7b7cb65..c4d21b2 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Mon Apr 29 2019 Richard W.M. Jones - 1.8.0-7 +- OCaml 4.08.0 (beta 3) rebuild. + * Mon Apr 29 2019 Richard W.M. Jones - 1.8.0-6 - Disable ocaml-camlp4 dependency until ported to 4.08. From e6a9a6910e4141b596d32a985814156b249d4ef2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Jun 2019 16:02:25 +0100 Subject: [PATCH 23/95] OCaml 4.08.0 (final) rebuild. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index c4d21b2..30a0654 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Thu Jun 27 2019 Richard W.M. Jones - 1.8.0-8 +- OCaml 4.08.0 (final) rebuild. + * Mon Apr 29 2019 Richard W.M. Jones - 1.8.0-7 - OCaml 4.08.0 (beta 3) rebuild. From 14c96aef3582d3940f4befa02494109b640fa50f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 22:52:47 +0000 Subject: [PATCH 24/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 30a0654..1e40870 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.8.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jun 27 2019 Richard W.M. Jones - 1.8.0-8 - OCaml 4.08.0 (final) rebuild. From 1c3cba7d25a00cb59b401305303cf33b4c84fc2d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Jul 2019 08:52:25 +0100 Subject: [PATCH 25/95] New upstream version 1.8.1, and OCaml 4.08.1 (rc2) rebuild. --- .gitignore | 1 + ocaml-findlib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c900bf2..633bb71 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ findlib-1.2.5.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 diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 1e40870..5671767 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib -Version: 1.8.0 -Release: 9%{?dist} +Version: 1.8.1 +Release: 1%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Tue Jul 30 2019 Richard W.M. Jones - 1.8.1-1 +- New upstream version 1.8.1, and OCaml 4.08.1 (rc2) rebuild. + * Thu Jul 25 2019 Fedora Release Engineering - 1.8.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index daffd68..4ed6529 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (findlib-1.8.0.tar.gz) = a6dbfd172bff20ebf05db8a0a952a9f0dc67f9420b89771dbfc6193a7a2e5fe448c9d3bdcc113591175906644299529ef937652cfb2c17f67ec2c4dbb1d71e48 +SHA512 (findlib-1.8.1.tar.gz) = 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1 From 3bf13b2e78a662d7d9e79db2f25bd5c9cfa45875 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 31 Jul 2019 10:52:30 +0100 Subject: [PATCH 26/95] OCaml 4.08.1 (rc2) rebuild. --- ocaml-findlib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 5671767..194acdb 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,8 +99,11 @@ make install \ %changelog +* Wed Jul 31 2019 Richard W.M. Jones - 1.8.1-2 +- OCaml 4.08.1 (rc2) rebuild. + * Tue Jul 30 2019 Richard W.M. Jones - 1.8.1-1 -- New upstream version 1.8.1, and OCaml 4.08.1 (rc2) rebuild. +- New upstream version 1.8.1. * Thu Jul 25 2019 Fedora Release Engineering - 1.8.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 8309addcd7e9bfd24ec7f4e6a6d25a9578ee0591 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 16 Aug 2019 10:34:26 +0100 Subject: [PATCH 27/95] OCaml 4.08.1 (final) rebuild. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 194acdb..5d01485 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Fri Aug 16 2019 Richard W.M. Jones - 1.8.1-3 +- OCaml 4.08.1 (final) rebuild. + * Wed Jul 31 2019 Richard W.M. Jones - 1.8.1-2 - OCaml 4.08.1 (rc2) rebuild. From 25d373ba07830b93b4eb15e0e9f5b8f0bb349aa2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 2 Sep 2019 15:28:12 +0100 Subject: [PATCH 28/95] Revert "Disable ocaml-camlp4 dependency until ported to 4.08." This reverts commit acebfa162d6684c022d65f520d28e2508ae2816e. --- ocaml-findlib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 5d01485..fc82495 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -8,7 +8,7 @@ URL: http://projects.camlcity.org/projects/findlib.html Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz BuildRequires: ocaml >= 4.02.0 -#BuildRequires: ocaml-camlp4-devel +BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-labltk-devel BuildRequires: ocaml-ocamlbuild-devel #BuildRequires: ocaml-num-devel @@ -99,6 +99,9 @@ make install \ %changelog +* Mon Sep 02 2019 Richard W.M. Jones - 1.8.1-4 +- Rebuild with camlp4. + * Fri Aug 16 2019 Richard W.M. Jones - 1.8.1-3 - OCaml 4.08.1 (final) rebuild. From a37e7f4aee1a478fa54760d698093c3b0dbacbda Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Dec 2019 17:33:30 +0000 Subject: [PATCH 29/95] Final removal of camlp4. --- ocaml-findlib.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index fc82495..dfceb27 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -8,7 +8,6 @@ URL: http://projects.camlcity.org/projects/findlib.html Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz BuildRequires: ocaml >= 4.02.0 -BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-labltk-devel BuildRequires: ocaml-ocamlbuild-devel #BuildRequires: ocaml-num-devel @@ -99,6 +98,9 @@ make install \ %changelog +* Thu Dec 05 2019 Richard W.M. Jones - 1.8.1-5 +- Final removal of camlp4. + * Mon Sep 02 2019 Richard W.M. Jones - 1.8.1-4 - Rebuild with camlp4. From 9187c90a21206432271f9b4f90c0a0887be0f238 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Dec 2019 17:54:45 +0000 Subject: [PATCH 30/95] OCaml 4.09.0 (final) rebuild. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index dfceb27..85bcb54 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Thu Dec 05 2019 Richard W.M. Jones - 1.8.1-6 +- OCaml 4.09.0 (final) rebuild. + * Thu Dec 05 2019 Richard W.M. Jones - 1.8.1-5 - Final removal of camlp4. From b382e889ae311ed2578198f58487f9526f9c0027 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Dec 2019 18:11:05 +0000 Subject: [PATCH 31/95] Bump and rebuild for fixed ocaml(runtime) dependency. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 85bcb54..881cc45 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Thu Dec 05 2019 Richard W.M. Jones - 1.8.1-7 +- Bump and rebuild for fixed ocaml(runtime) dependency. + * Thu Dec 05 2019 Richard W.M. Jones - 1.8.1-6 - OCaml 4.09.0 (final) rebuild. From 0c7567a13271b134ebb6ad81d55704e2827d4842 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 8 Jan 2020 10:25:26 +0000 Subject: [PATCH 32/95] OCaml 4.09.0 for riscv64 --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 881cc45..93af8a9 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Wed Jan 08 2020 Richard W.M. Jones - 1.8.1-8 +- OCaml 4.09.0 for riscv64 + * Thu Dec 05 2019 Richard W.M. Jones - 1.8.1-7 - Bump and rebuild for fixed ocaml(runtime) dependency. From 81ed82592ccb24630e8a7135f0486ab5425c0392 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 9 Jan 2020 13:30:49 +0000 Subject: [PATCH 33/95] Bump release and rebuild. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 93af8a9..e5f2869 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Thu Jan 09 2020 Richard W.M. Jones - 1.8.1-9 +- Bump release and rebuild. + * Wed Jan 08 2020 Richard W.M. Jones - 1.8.1-8 - OCaml 4.09.0 for riscv64 From d1ed7b3e3ea8b320b65a5470987e6d5fb837ef6b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 19 Jan 2020 11:42:25 +0000 Subject: [PATCH 34/95] OCaml 4.10.0+beta1 rebuild. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index e5f2869..15ff1dc 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Sun Jan 19 2020 Richard W.M. Jones - 1.8.1-10 +- OCaml 4.10.0+beta1 rebuild. + * Thu Jan 09 2020 Richard W.M. Jones - 1.8.1-9 - Bump release and rebuild. From 8703f91af55bae76cb3966cfbe5be1d14edba15e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 19:35:20 +0000 Subject: [PATCH 35/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 15ff1dc..373f93b 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.8.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Jan 19 2020 Richard W.M. Jones - 1.8.1-10 - OCaml 4.10.0+beta1 rebuild. From 27a8de100cdbd6d2679a44b185a616e28c2e6a2e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 26 Feb 2020 10:37:12 +0000 Subject: [PATCH 36/95] OCaml 4.10.0 final. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 373f93b..d066c55 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Wed Feb 26 2020 Richard W.M. Jones - 1.8.1-12 +- OCaml 4.10.0 final. + * Wed Jan 29 2020 Fedora Release Engineering - 1.8.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 1aaa65821260eaf1df917b1262b7c454b658c282 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Apr 2020 13:06:45 +0100 Subject: [PATCH 37/95] Update all OCaml dependencies for RPM 4.16. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index d066c55..095b575 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Thu Apr 02 2020 Richard W.M. Jones - 1.8.1-13 +- Update all OCaml dependencies for RPM 4.16. + * Wed Feb 26 2020 Richard W.M. Jones - 1.8.1-12 - OCaml 4.10.0 final. From 09eaa23655a12a3be349d23e679838e47de85ccd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 17 Apr 2020 21:05:30 +0100 Subject: [PATCH 38/95] OCaml 4.11.0 pre-release --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 095b575..405ca38 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Fri Apr 17 2020 Richard W.M. Jones - 1.8.1-14 +- OCaml 4.11.0 pre-release + * Thu Apr 02 2020 Richard W.M. Jones - 1.8.1-13 - Update all OCaml dependencies for RPM 4.16. From e28df26fcdd50da37004705005c7d62ba216ad59 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 21 Apr 2020 16:36:35 +0100 Subject: [PATCH 39/95] OCaml 4.11.0 pre-release attempt 2 --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 405ca38..329d84c 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Tue Apr 21 2020 Richard W.M. Jones - 1.8.1-15 +- OCaml 4.11.0 pre-release attempt 2 + * Fri Apr 17 2020 Richard W.M. Jones - 1.8.1-14 - OCaml 4.11.0 pre-release From f55d860c6d4ba14b8005945395784f75134775cd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 May 2020 22:42:48 +0100 Subject: [PATCH 40/95] OCaml 4.11.0+dev2-2020-04-22 rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 329d84c..99dc7ec 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Mon May 04 2020 Richard W.M. Jones - 1.8.1-16 +- OCaml 4.11.0+dev2-2020-04-22 rebuild + * Tue Apr 21 2020 Richard W.M. Jones - 1.8.1-15 - OCaml 4.11.0 pre-release attempt 2 From 003009d2ad6ce5f8e9c4409f620f579f1587c9fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 12:09:49 +0000 Subject: [PATCH 41/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 99dc7ec..56a1885 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.8.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon May 04 2020 Richard W.M. Jones - 1.8.1-16 - OCaml 4.11.0+dev2-2020-04-22 rebuild From 8068bb1779cb4af899ee5adc7a03ea3b2d5e71c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 06:37:39 +0000 Subject: [PATCH 42/95] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-findlib.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 56a1885..b6b2f0b 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,10 @@ make install \ %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.8.1-18 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.8.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 97b0721117ea2392e81b47b80608d1f8a55806a9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 3 Aug 2020 20:53:28 +0100 Subject: [PATCH 43/95] Bump and rebuild to fix Dynlink dependency. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index b6b2f0b..381d245 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Mon Aug 03 2020 Richard W.M. Jones - 1.8.1-19 +- Bump and rebuild to fix Dynlink dependency. + * Sat Aug 01 2020 Fedora Release Engineering - 1.8.1-18 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 512e1930ced2dc87100382424cd61ef551558038 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 21 Aug 2020 11:48:02 +0100 Subject: [PATCH 44/95] OCaml 4.11.0 rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 381d245..fa64709 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Fri Aug 21 2020 Richard W.M. Jones - 1.8.1-20 +- OCaml 4.11.0 rebuild + * Mon Aug 03 2020 Richard W.M. Jones - 1.8.1-19 - Bump and rebuild to fix Dynlink dependency. From 03d1ff9dfb4fb4be29af32db9ddc401c3221f6c4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 1 Sep 2020 19:58:03 +0100 Subject: [PATCH 45/95] OCaml 4.11.1 rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index fa64709..4715891 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -98,6 +98,9 @@ make install \ %changelog +* Tue Sep 01 2020 Richard W.M. Jones - 1.8.1-21 +- OCaml 4.11.1 rebuild + * Fri Aug 21 2020 Richard W.M. Jones - 1.8.1-20 - OCaml 4.11.0 rebuild From e600cfab6809d27c4eaa813d22eb176abec678a4 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 06:13:54 +0000 Subject: [PATCH 46/95] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- ocaml-findlib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 4715891..54291a6 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -7,6 +7,7 @@ License: BSD URL: http://projects.camlcity.org/projects/findlib.html Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz +BuildRequires: make BuildRequires: ocaml >= 4.02.0 BuildRequires: ocaml-labltk-devel BuildRequires: ocaml-ocamlbuild-devel From 63d9aa9e5e3b6dd938d2b30f0b756c87ea8407e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:57:32 +0000 Subject: [PATCH 47/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 54291a6..da180b1 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.8.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Sep 01 2020 Richard W.M. Jones - 1.8.1-21 - OCaml 4.11.1 rebuild From d6a9da2635c5ecc3f92af146239a48b9c16459dd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Feb 2021 18:24:48 +0000 Subject: [PATCH 48/95] Bump and rebuild for updated ocaml Dynlink dependency. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index da180b1..62b757b 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Mon Feb 1 2021 Richard W.M. Jones - 1.8.1-23 +- Bump and rebuild for updated ocaml Dynlink dependency. + * Tue Jan 26 2021 Fedora Release Engineering - 1.8.1-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 49bcd4dd02c6afb40a100c1c3c9df788fec4fe43 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Mar 2021 09:37:09 +0000 Subject: [PATCH 49/95] OCaml 4.12.0 build --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 62b757b..00a9f44 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Mon Mar 1 09:37:08 GMT 2021 Richard W.M. Jones - 1.8.1-24 +- OCaml 4.12.0 build + * Mon Feb 1 2021 Richard W.M. Jones - 1.8.1-23 - Bump and rebuild for updated ocaml Dynlink dependency. From 6e79c64f1bd47a064b55b4d68eb45630301965f8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Mar 2021 09:47:54 +0000 Subject: [PATCH 50/95] Rebuild for updated ocaml-labltk --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 00a9f44..ebaad05 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Mon Mar 1 2021 Richard W.M. Jones - 1.8.1-25 +- Rebuild for updated ocaml-labltk + * Mon Mar 1 09:37:08 GMT 2021 Richard W.M. Jones - 1.8.1-24 - OCaml 4.12.0 build From fc51f9e003a7b7d4033bb512156f2fcfedaab91f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 15 Mar 2021 11:44:40 +0000 Subject: [PATCH 51/95] Bump and rebuild for ELN broken deps. --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index ebaad05..3b82e14 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.8.1 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Mon Mar 15 2021 Richard W.M. Jones - 1.8.1-26 +- Bump and rebuild for ELN broken deps. + * Mon Mar 1 2021 Richard W.M. Jones - 1.8.1-25 - Rebuild for updated ocaml-labltk From cfcdad51ea85d6fdd734f9cf1479228d541bba1c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 15 Mar 2021 15:19:21 +0000 Subject: [PATCH 52/95] New upstream version 1.9. --- .gitignore | 1 + ocaml-findlib.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 633bb71..b98fa9e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ findlib-1.2.5.tar.gz /findlib-1.7.3.tar.gz /findlib-1.8.0.tar.gz /findlib-1.8.1.tar.gz +/findlib-1.9.tar.gz diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 3b82e14..a480dbf 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,13 +1,12 @@ Name: ocaml-findlib -Version: 1.8.1 -Release: 26%{?dist} +Version: 1.9 +Release: 1%{?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 -BuildRequires: make BuildRequires: ocaml >= 4.02.0 BuildRequires: ocaml-labltk-devel BuildRequires: ocaml-ocamlbuild-devel @@ -16,6 +15,7 @@ BuildRequires: ocaml-compiler-libs BuildRequires: ocaml-ocamldoc BuildRequires: m4, ncurses-devel BuildRequires: gawk +BuildRequires: make Requires: ocaml %global __ocaml_requires_opts -i Asttypes -i Parsetree @@ -38,6 +38,9 @@ developing applications that use %{name}. %prep %setup -q -n findlib-%{version} +# Stray backslash in findlib 1.9. Fix sent upstream 2021-03-15. +sed -i -e 's/\(test.*camlp4.*\) \\$/\1/' Makefile + %build ocamlc -version @@ -99,6 +102,9 @@ make install \ %changelog +* Mon Mar 15 2021 Richard W.M. Jones - 1.9-1 +- New upstream version 1.9. + * Mon Mar 15 2021 Richard W.M. Jones - 1.8.1-26 - Bump and rebuild for ELN broken deps. diff --git a/sources b/sources index 4ed6529..96b622a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (findlib-1.8.1.tar.gz) = 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1 +SHA512 (findlib-1.9.tar.gz) = b2084ef88d514cdec1ea988487f23ea006189031ff2eddf1d2f2e96db0f164856929475fbd8b5f6cf3844e8b3f0fba2aa8b7846174f1a1d815ce459eda3b661f From 0eda5a4868648b886f5533cf9b66084239522a3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 16:37:46 +0000 Subject: [PATCH 53/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 a480dbf..de840cd 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -102,6 +102,9 @@ make install \ %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Mar 15 2021 Richard W.M. Jones - 1.9-1 - New upstream version 1.9. From 5b47ababeaf6a9069a43df0db6977446389b7452 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 27 Jul 2021 19:19:51 +0100 Subject: [PATCH 54/95] Rebuild for changed ocamlx(Dynlink) --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index de840cd..22da461 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -102,6 +102,9 @@ make install \ %changelog +* Tue Jul 27 2021 Richard W.M. Jones - 1.9-3 +- Rebuild for changed ocamlx(Dynlink) + * Thu Jul 22 2021 Fedora Release Engineering - 1.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e593869402345e438c7ea7d7f95ad9fe4d0e2881 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Oct 2021 17:22:20 +0100 Subject: [PATCH 55/95] New upstream development version 1.9.1 --- .gitignore | 1 + ocaml-findlib.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b98fa9e..95f9fff 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ findlib-1.2.5.tar.gz /findlib-1.8.0.tar.gz /findlib-1.8.1.tar.gz /findlib-1.9.tar.gz +/findlib-1.9.1.tar.gz diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 22da461..ca41365 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib -Version: 1.9 -Release: 3%{?dist} +Version: 1.9.1 +Release: 1%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -38,9 +38,6 @@ developing applications that use %{name}. %prep %setup -q -n findlib-%{version} -# Stray backslash in findlib 1.9. Fix sent upstream 2021-03-15. -sed -i -e 's/\(test.*camlp4.*\) \\$/\1/' Makefile - %build ocamlc -version @@ -102,6 +99,9 @@ make install \ %changelog +* Mon Oct 04 2021 Richard W.M. Jones - 1.9.1-1 +- New upstream development version 1.9.1 + * Tue Jul 27 2021 Richard W.M. Jones - 1.9-3 - Rebuild for changed ocamlx(Dynlink) diff --git a/sources b/sources index 96b622a..bcd94f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (findlib-1.9.tar.gz) = b2084ef88d514cdec1ea988487f23ea006189031ff2eddf1d2f2e96db0f164856929475fbd8b5f6cf3844e8b3f0fba2aa8b7846174f1a1d815ce459eda3b661f +SHA512 (findlib-1.9.1.tar.gz) = 83a05f3e310fa7cabb0475c5525f7a87c1b6bc2dc5e39f094cabfb5d944a826a5581844ba00ec1a48dd96184eb9de3c4d1055cdddee2b83c700a2de5a6dc6f84 From bb2180ccd77db1183dd084fbf9b29ee102233a4a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Oct 2021 17:36:42 +0100 Subject: [PATCH 56/95] OCaml 4.13.1 build --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index ca41365..fd68096 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Mon Oct 04 2021 Richard W.M. Jones - 1.9.1-2 +- OCaml 4.13.1 build + * Mon Oct 04 2021 Richard W.M. Jones - 1.9.1-1 - New upstream development version 1.9.1 From 06175e87d20c149496fe24ef65515817d0fab8e6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Oct 2021 18:41:59 +0100 Subject: [PATCH 57/95] Bump and rebuild for updated ocaml-labltk --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index fd68096..5362e53 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Objective CAML package manager and build helper License: BSD @@ -99,6 +99,9 @@ make install \ %changelog +* Mon Oct 04 2021 Richard W.M. Jones - 1.9.1-3 +- Bump and rebuild for updated ocaml-labltk + * Mon Oct 04 2021 Richard W.M. Jones - 1.9.1-2 - OCaml 4.13.1 build From 1b1f14d13018716f2aa81abdd8d4aa807560854f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 7 Jan 2022 09:15:42 -0700 Subject: [PATCH 58/95] Fix labltk detection. Change license from BSD to MIT. --- 0a3dfcd.patch | 22 ++++++++++++++++++++++ ocaml-findlib.spec | 15 +++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 0a3dfcd.patch diff --git a/0a3dfcd.patch b/0a3dfcd.patch new file mode 100644 index 0000000..d062a98 --- /dev/null +++ b/0a3dfcd.patch @@ -0,0 +1,22 @@ +From 0a3dfcdcb620ac278d252a731e5359a244ebc671 Mon Sep 17 00:00:00 2001 +From: Jerry James +Date: Wed, 5 Jan 2022 21:08:14 -0700 +Subject: [PATCH] Fix typo: labtk -> labltk + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 46bebaa..8a6a0a8 100755 +--- a/configure ++++ b/configure +@@ -526,7 +526,7 @@ else + have_str=0 + fi + +-if check_library labltk 'normal since 4.02' labltk/labtk.cma; then ++if check_library labltk 'normal since 4.02' labltk/labltk.cma; then + have_labltk=1 + else + have_labltk=0 diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 5362e53..b98f3cb 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,11 +1,14 @@ Name: ocaml-findlib Version: 1.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Objective CAML package manager and build helper -License: BSD +License: MIT URL: http://projects.camlcity.org/projects/findlib.html Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz +# Fix typo that prevents labltk use +# See https://github.com/ocaml/ocamlfind/pull/28 +Patch0: https://github.com/ocaml/ocamlfind/commit/0a3dfcd.patch BuildRequires: ocaml >= 4.02.0 BuildRequires: ocaml-labltk-devel @@ -27,7 +30,7 @@ Objective CAML package manager and build helper. %package devel Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -36,7 +39,7 @@ developing applications that use %{name}. %prep -%setup -q -n findlib-%{version} +%autosetup -p1 -n findlib-%{version} %build @@ -99,6 +102,10 @@ make install \ %changelog +* Fri Jan 7 2022 Jerry James - 1.9.1-4 +- Fix labltk detection +- Change license from BSD to MIT + * Mon Oct 04 2021 Richard W.M. Jones - 1.9.1-3 - Bump and rebuild for updated ocaml-labltk From 2f042865de105671fadac9a473fb7a8ad26e770c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 21:44:07 +0000 Subject: [PATCH 59/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 b98f3cb..1a0bee8 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,6 +1,6 @@ Name: ocaml-findlib Version: 1.9.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -102,6 +102,9 @@ make install \ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jan 7 2022 Jerry James - 1.9.1-4 - Fix labltk detection - Change license from BSD to MIT From 5896f52b7a63704a807a49d819af0fab247044e2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 22 Jan 2022 08:25:40 +0000 Subject: [PATCH 60/95] Update to findlib 1.9.2 --- .gitignore | 1 + 0a3dfcd.patch | 22 ---------------------- ocaml-findlib.spec | 11 ++++++----- sources | 2 +- 4 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 0a3dfcd.patch diff --git a/.gitignore b/.gitignore index 95f9fff..c1703aa 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ findlib-1.2.5.tar.gz /findlib-1.8.1.tar.gz /findlib-1.9.tar.gz /findlib-1.9.1.tar.gz +/findlib-1.9.2.tar.gz diff --git a/0a3dfcd.patch b/0a3dfcd.patch deleted file mode 100644 index d062a98..0000000 --- a/0a3dfcd.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0a3dfcdcb620ac278d252a731e5359a244ebc671 Mon Sep 17 00:00:00 2001 -From: Jerry James -Date: Wed, 5 Jan 2022 21:08:14 -0700 -Subject: [PATCH] Fix typo: labtk -> labltk - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 46bebaa..8a6a0a8 100755 ---- a/configure -+++ b/configure -@@ -526,7 +526,7 @@ else - have_str=0 - fi - --if check_library labltk 'normal since 4.02' labltk/labtk.cma; then -+if check_library labltk 'normal since 4.02' labltk/labltk.cma; then - have_labltk=1 - else - have_labltk=0 diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 1a0bee8..da367a4 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,14 +1,11 @@ Name: ocaml-findlib -Version: 1.9.1 -Release: 5%{?dist} +Version: 1.9.2 +Release: 1%{?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 typo that prevents labltk use -# See https://github.com/ocaml/ocamlfind/pull/28 -Patch0: https://github.com/ocaml/ocamlfind/commit/0a3dfcd.patch BuildRequires: ocaml >= 4.02.0 BuildRequires: ocaml-labltk-devel @@ -102,6 +99,10 @@ make install \ %changelog +* Sat Jan 22 2022 Richard W.M. Jones - 1.9.2-1 +- Update to findlib 1.9.2 +- Remove patch which has been applied upstream. + * Thu Jan 20 2022 Fedora Release Engineering - 1.9.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index bcd94f6..23673ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (findlib-1.9.1.tar.gz) = 83a05f3e310fa7cabb0475c5525f7a87c1b6bc2dc5e39f094cabfb5d944a826a5581844ba00ec1a48dd96184eb9de3c4d1055cdddee2b83c700a2de5a6dc6f84 +SHA512 (findlib-1.9.2.tar.gz) = c43d43e502869d52e7eb0e5fcf900039fd4ce0c997a4c823f8d5d9ead0c62120447a787723b884bda0db210e9e60fb513d767c4ea6c18bb38effdc8e35a4b75e From 3dc98288136da6e6c19b561575c063ab8fdf8492 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 26 Jan 2022 12:46:02 +0000 Subject: [PATCH 61/95] Update to findlib 1.9.3 --- .gitignore | 1 + ocaml-findlib.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c1703aa..6e60f77 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ findlib-1.2.5.tar.gz /findlib-1.9.tar.gz /findlib-1.9.1.tar.gz /findlib-1.9.2.tar.gz +/findlib-1.9.3.tar.gz diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index da367a4..b98c91d 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,5 +1,5 @@ Name: ocaml-findlib -Version: 1.9.2 +Version: 1.9.3 Release: 1%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -99,6 +99,9 @@ make install \ %changelog +* Wed Jan 26 2022 Richard W.M. Jones - 1.9.3-1 +- Update to findlib 1.9.3 + * Sat Jan 22 2022 Richard W.M. Jones - 1.9.2-1 - Update to findlib 1.9.2 - Remove patch which has been applied upstream. diff --git a/sources b/sources index 23673ee..cf506ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (findlib-1.9.2.tar.gz) = c43d43e502869d52e7eb0e5fcf900039fd4ce0c997a4c823f8d5d9ead0c62120447a787723b884bda0db210e9e60fb513d767c4ea6c18bb38effdc8e35a4b75e +SHA512 (findlib-1.9.3.tar.gz) = 27cc4ce141576bf477fb9d61a82ad65f55478740eed59fb43f43edb794140829fd2ff89ad27d8a890cfc336b54c073a06de05b31100fc7c01cacbd7d88e928ea From b4183a7463a50e359b37f86090d6ab1906a11cac Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 26 Jan 2022 13:55:45 +0000 Subject: [PATCH 62/95] Add %undefine _package_note_file --- ocaml-findlib.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index b98c91d..7e349de 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,3 +1,7 @@ +# https://bugzilla.redhat.com/show_bug.cgi?id=2043178 +# /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 + Name: ocaml-findlib Version: 1.9.3 Release: 1%{?dist} From f346b20b7c3169540cf83a5368a88aa9ea2e287c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 26 Jan 2022 14:11:58 +0000 Subject: [PATCH 63/95] Update link to bugs about package notes --- ocaml-findlib.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 7e349de..2f2b59d 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,4 +1,5 @@ -# https://bugzilla.redhat.com/show_bug.cgi?id=2043178 +# 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 From 984434a66fe2336052ff1d01bee4f7a6b5fe0d73 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Feb 2022 12:10:47 +0000 Subject: [PATCH 64/95] OCaml 4.13.1 rebuild to remove package notes --- ocaml-findlib.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 2f2b59d..4927edc 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,3 +1,4 @@ +%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 @@ -5,7 +6,7 @@ Name: ocaml-findlib Version: 1.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -104,6 +105,9 @@ make install \ %changelog +* Fri Feb 04 2022 Richard W.M. Jones - 1.9.3-2 +- OCaml 4.13.1 rebuild to remove package notes + * Wed Jan 26 2022 Richard W.M. Jones - 1.9.3-1 - Update to findlib 1.9.3 From 1c221f632c0c25ad73c0e411fea8b4ad6f901510 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 8 Jun 2022 18:15:27 +0100 Subject: [PATCH 65/95] Update to findlib 1.9.4 --- .gitignore | 1 + ocaml-findlib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6e60f77..02aad64 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ findlib-1.2.5.tar.gz /findlib-1.9.1.tar.gz /findlib-1.9.2.tar.gz /findlib-1.9.3.tar.gz +/findlib-1.9.4.tar.gz diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 4927edc..3fe4ee7 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -5,8 +5,8 @@ %undefine _package_note_file Name: ocaml-findlib -Version: 1.9.3 -Release: 2%{?dist} +Version: 1.9.4 +Release: 1%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -105,6 +105,9 @@ make install \ %changelog +* Wed Jun 08 2022 Richard W.M. Jones - 1.9.4-1 +- Update to findlib 1.9.4 + * Fri Feb 04 2022 Richard W.M. Jones - 1.9.3-2 - OCaml 4.13.1 rebuild to remove package notes diff --git a/sources b/sources index cf506ed..ffbb298 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (findlib-1.9.3.tar.gz) = 27cc4ce141576bf477fb9d61a82ad65f55478740eed59fb43f43edb794140829fd2ff89ad27d8a890cfc336b54c073a06de05b31100fc7c01cacbd7d88e928ea +SHA512 (findlib-1.9.4.tar.gz) = c987b02395185949283aed62161ceb74ac388abb8c86904962fdab4682a39f36de49a774941c5d9da9b4052e172c549004903c38c9f688a44fa4bff2449029a1 From aa88eb5cd0a16b6066eb3479ba9997c85974bc1c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 18 Jun 2022 14:30:53 +0100 Subject: [PATCH 66/95] OCaml 4.14.0 rebuild --- ocaml-findlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 3fe4ee7..b27b90d 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -6,7 +6,7 @@ Name: ocaml-findlib Version: 1.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -105,6 +105,9 @@ make install \ %changelog +* Sat Jun 18 2022 Richard W.M. Jones - 1.9.4-2 +- OCaml 4.14.0 rebuild + * Wed Jun 08 2022 Richard W.M. Jones - 1.9.4-1 - Update to findlib 1.9.4 From 6f54a5225c6f38674af552fb09ac7f3b2da36e30 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 19 Jun 2022 13:39:39 +0100 Subject: [PATCH 67/95] New upstream version 1.9.5 --- .gitignore | 1 + ocaml-findlib.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 02aad64..dc7075f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ findlib-1.2.5.tar.gz /findlib-1.9.2.tar.gz /findlib-1.9.3.tar.gz /findlib-1.9.4.tar.gz +/findlib-1.9.5.tar.gz diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index b27b90d..eda8d1a 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -5,8 +5,8 @@ %undefine _package_note_file Name: ocaml-findlib -Version: 1.9.4 -Release: 2%{?dist} +Version: 1.9.5 +Release: 1%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -105,6 +105,9 @@ make install \ %changelog +* Sun Jun 19 2022 Richard W.M. Jones - 1.9.5-1 +- New upstream version 1.9.5 + * Sat Jun 18 2022 Richard W.M. Jones - 1.9.4-2 - OCaml 4.14.0 rebuild diff --git a/sources b/sources index ffbb298..38c8501 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (findlib-1.9.4.tar.gz) = c987b02395185949283aed62161ceb74ac388abb8c86904962fdab4682a39f36de49a774941c5d9da9b4052e172c549004903c38c9f688a44fa4bff2449029a1 +SHA512 (findlib-1.9.5.tar.gz) = 03514c618a16b02889db997c6c4789b3436b3ad7d974348d2c6dea53eb78898ab285ce5f10297c074bab4fd2c82931a8b7c5c113b994447a44abb30fca74c715 From b5373e9cf48bfcda1e7c834ae47100ae5f824275 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 01:13:54 +0000 Subject: [PATCH 68/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 eda8d1a..8b26bd1 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -6,7 +6,7 @@ Name: ocaml-findlib Version: 1.9.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective CAML package manager and build helper License: MIT @@ -105,6 +105,9 @@ make install \ %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.9.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jun 19 2022 Richard W.M. Jones - 1.9.5-1 - New upstream version 1.9.5 From 5cf430f5202f9d3c00fe79950bd089a42ec58c9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:08:13 +0000 Subject: [PATCH 69/95] 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 70/95] 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 71/95] 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 72/95] 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 73/95] 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 74/95] 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 75/95] 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 76/95] 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 77/95] 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 78/95] 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 79/95] 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 80/95] 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 81/95] 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 82/95] 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 83/95] 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 84/95] 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 85/95] 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 86/95] 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 87/95] 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 88/95] 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 89/95] 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 90/95] 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 91/95] 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 92/95] 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 93/95] 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 94/95] 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 95/95] 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