[ocaml-tplib] Add -ocamlbuild patch to fix build with ocaml 4.02.0. Fix license handling.

Jerry James jjames at fedoraproject.org
Fri Sep 19 21:16:27 UTC 2014


commit 732a5dd081b118472f9574a22d52cd8bdf223522
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Fri Sep 19 15:16:15 2014 -0600

    Add -ocamlbuild patch to fix build with ocaml 4.02.0.
    Fix license handling.

 ocaml-tplib-gmp.patch        |   11 -----------
 ocaml-tplib-ocamlbuild.patch |   11 +++++++++++
 ocaml-tplib.spec             |   13 +++++++++++--
 3 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/ocaml-tplib-ocamlbuild.patch b/ocaml-tplib-ocamlbuild.patch
new file mode 100644
index 0000000..574391a
--- /dev/null
+++ b/ocaml-tplib-ocamlbuild.patch
@@ -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@
+ 
diff --git a/ocaml-tplib.spec b/ocaml-tplib.spec
index 3075f9f..27fbac8 100644
--- a/ocaml-tplib.spec
+++ b/ocaml-tplib.spec
@@ -2,7 +2,7 @@
 
 Name:           ocaml-tplib
 Version:        1.3
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Tropical Polyhedra Library
 
 License:        LGPLv2+
@@ -17,6 +17,9 @@ Source3:        compute_halfspaces.1
 Source4:        compute_minimal_external_representations.1
 Source5:        compute_tangent_hypergraph.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-camlidl-devel
@@ -54,6 +57,7 @@ Tools that use TPLib.
 
 %prep
 %setup -q -n tplib-%{version}
+%patch0
 
 # Enable debuginfo generation
 sed -i 's/@OCAMLBUILD@/& -cflag -g -lflag -g/' Makefile.in
@@ -80,7 +84,8 @@ _build/tests/test_tplib_double
 _build/tests/test_tplib_rational
 
 %files
-%doc LICENSE README
+%doc README
+%license LICENSE
 %{_libdir}/ocaml/tplib/
 %exclude %{_libdir}/ocaml/tplib/*.a
 %exclude %{_libdir}/ocaml/tplib/*.cmxa
@@ -98,6 +103,10 @@ _build/tests/test_tplib_rational
 %doc %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 19 2014 Jerry James <loganjerry at 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 at redhat.com> - 1.3-12
 - Bump release and rebuild.
 


More information about the scm-commits mailing list