Add -ocamlbuild patch to fix build with ocaml 4.02.0.

Fix license handling.
This commit is contained in:
Jerry James 2014-09-19 15:16:15 -06:00
parent a4de5b755b
commit 732a5dd081
3 changed files with 22 additions and 13 deletions

View File

@ -1,11 +0,0 @@
--- ./src/numeric_plugins/mlgmp_plugin.ml.orig 2013-02-14 04:08:25.000000000 -0700
+++ ./src/numeric_plugins/mlgmp_plugin.ml 2013-02-19 13:56:39.613438907 -0700
@@ -19,7 +19,7 @@
*)
-open Gmp
+open Mlgmp
let bits_of_string s =
let s' = String.sub s 2 ((String.length s)-2) in (* remove prefix "0b" *)

View File

@ -0,0 +1,11 @@
--- Makefile.in.orig 2013-02-14 12:08:25.000000000 +0100
+++ Makefile.in 2014-08-28 18:31:03.000000000 +0200
@@ -31,7 +31,7 @@
CP = cp
RANLIB = ranlib
BUILD_DIR = _build
-OCAMLBUILD = @OCAMLBUILD@ -ocamlc ocp-ocamlc.opt -ocamlopt ocp-ocamlopt.opt -classic-display -no-links -build-dir $(BUILD_DIR) -use-ocamlfind
+OCAMLBUILD = @OCAMLBUILD@ -classic-display -no-links -build-dir $(BUILD_DIR) -use-ocamlfind
OCAMLFIND = @OCAMLFIND@
TPLIB = @PACKAGE_NAME@

View File

@ -2,7 +2,7 @@
Name: ocaml-tplib Name: ocaml-tplib
Version: 1.3 Version: 1.3
Release: 12%{?dist} Release: 13%{?dist}
Summary: Tropical Polyhedra Library Summary: Tropical Polyhedra Library
License: LGPLv2+ License: LGPLv2+
@ -17,6 +17,9 @@ Source3: compute_halfspaces.1
Source4: compute_minimal_external_representations.1 Source4: compute_minimal_external_representations.1
Source5: compute_tangent_hypergraph.1 Source5: compute_tangent_hypergraph.1
Source6: compute_tropical_complex.1 Source6: compute_tropical_complex.1
# Upstream patch to adapt to new ocamlbuild behavior. See
# https://github.com/ocaml/opam-repository/blob/master/packages/tplib/tplib.1.3/files/fix-makefile.diff
Patch0: %{name}-ocamlbuild.patch
BuildRequires: ocaml BuildRequires: ocaml
BuildRequires: ocaml-camlidl-devel BuildRequires: ocaml-camlidl-devel
@ -54,6 +57,7 @@ Tools that use TPLib.
%prep %prep
%setup -q -n tplib-%{version} %setup -q -n tplib-%{version}
%patch0
# Enable debuginfo generation # Enable debuginfo generation
sed -i 's/@OCAMLBUILD@/& -cflag -g -lflag -g/' Makefile.in sed -i 's/@OCAMLBUILD@/& -cflag -g -lflag -g/' Makefile.in
@ -80,7 +84,8 @@ _build/tests/test_tplib_double
_build/tests/test_tplib_rational _build/tests/test_tplib_rational
%files %files
%doc LICENSE README %doc README
%license LICENSE
%{_libdir}/ocaml/tplib/ %{_libdir}/ocaml/tplib/
%exclude %{_libdir}/ocaml/tplib/*.a %exclude %{_libdir}/ocaml/tplib/*.a
%exclude %{_libdir}/ocaml/tplib/*.cmxa %exclude %{_libdir}/ocaml/tplib/*.cmxa
@ -98,6 +103,10 @@ _build/tests/test_tplib_rational
%doc %{_mandir}/man1/* %doc %{_mandir}/man1/*
%changelog %changelog
* Fri Sep 19 2014 Jerry James <loganjerry@gmail.com> - 1.3-13
- Add -ocamlbuild patch to fix build with ocaml 4.02.0
- Fix license handling
* Sun Aug 24 2014 Richard W.M. Jones <rjones@redhat.com> - 1.3-12 * Sun Aug 24 2014 Richard W.M. Jones <rjones@redhat.com> - 1.3-12
- Bump release and rebuild. - Bump release and rebuild.