Fix labltk detection. Change license from BSD to MIT.

This commit is contained in:
Jerry James 2022-01-07 09:15:42 -07:00
parent 06175e87d2
commit 1b1f14d130
2 changed files with 33 additions and 4 deletions

22
0a3dfcd.patch Normal file
View File

@ -0,0 +1,22 @@
From 0a3dfcdcb620ac278d252a731e5359a244ebc671 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
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

View File

@ -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 <loganjerry@gmail.com> - 1.9.1-4
- Fix labltk detection
- Change license from BSD to MIT
* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9.1-3
- Bump and rebuild for updated ocaml-labltk