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