Update to findlib 1.8.0.

- Remove upstream patches.
This commit is contained in:
Richard W.M. Jones 2018-04-26 14:26:34 +01:00
parent bcaab7341b
commit e4ce403f6b
5 changed files with 8 additions and 69 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -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 --

View File

@ -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.</p>
<ul>
<li>
+ <p><em>git version:</em> Fix reinstallation of "num" for OCaml-4.06.
+ </p>
+ </li>
+
+ <li>
<p><em>1.7.3:</em> Fix regarding num-top: this library is now also
optional, as num.</p>
</li>

View File

@ -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 <rjones@redhat.com> - 1.8.0-1
- Update to findlib 1.8.0.
- Remove upstream patches.
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (findlib-1.7.3.tar.gz) = 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886
SHA512 (findlib-1.8.0.tar.gz) = a6dbfd172bff20ebf05db8a0a952a9f0dc67f9420b89771dbfc6193a7a2e5fe448c9d3bdcc113591175906644299529ef937652cfb2c17f67ec2c4dbb1d71e48