[ocaml-tplib] New upstream release. Upstream dropped MLGMPIDL support in favor of MLGMP, which we don't ship.

Jerry James jjames at fedoraproject.org
Tue Feb 19 21:42:07 UTC 2013


commit 06e1a41b862de44d177ecfbb5a33261ffb6c6441
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Tue Feb 19 14:41:53 2013 -0700

    New upstream release.
    Upstream dropped MLGMPIDL support in favor of MLGMP, which we don't ship.

 .gitignore                                 |    2 +-
 compute_ext_rays.1                         |   11 ++++++-----
 compute_ext_rays_polar.1                   |    5 +++--
 compute_halfspaces.1                       |    7 ++++---
 compute_minimal_external_representations.1 |   24 ++++++++++++++++++++++++
 compute_tangent_hypergraph.1               |    5 +++--
 compute_tropical_complex.1                 |   24 ++++++++++++++++++++++++
 ocaml-tplib-gmp.patch                      |   11 +++++++++++
 ocaml-tplib.spec                           |   24 +++++++++++++-----------
 sources                                    |    2 +-
 10 files changed, 90 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c5e038b..0cef4b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/TPLib-1.2.tar.gz
+/tplib-1.3.tar.gz
diff --git a/compute_ext_rays.1 b/compute_ext_rays.1
index 98c8332..bcc616b 100644
--- a/compute_ext_rays.1
+++ b/compute_ext_rays.1
@@ -1,4 +1,4 @@
-.TH "compute_ext_rays" "1" "May 2012" "TPLib 1.2" "User Commands"
+.TH "compute_ext_rays" "1" "Feb 2013" "TPLib 1.3" "User Commands"
 .SH "NAME"
 compute_ext_rays \- compute extreme rays of a tropical cone
 .SH "DESCRIPTION"
@@ -17,16 +17,17 @@ Use the min\-plus semiring instead of the default max\-plus semiring.
 The constraints are not dynamically ordered during the execution.
 .TP
 \fB\-polymake\-output\fP
-Output under polymake format.  Takes an optional argument, corresponding to a
-list c_1,...,c_p of coordinates on which the result is projected.
+Output under polymake format.  Takes an argument, corresponding to a list
+c_1,...,c_p of coordinates on which the result is projected.
 .TP
 \fB\-bounding\-box\fP
 Set a bounding box, specified as a list (separated by commas) of
-triples (c,l,u), where c is the index of a coordinate, and l and u are lower
+triples (c:l:u), where c is the index of a coordinate, and l and u are lower
 and upper bounds (\fB\-infinity\fP/\fB+infinity\fP are allowed).
 .TP
 \fB\-help\fP, \fB\-\-help\fP
 Display this list of options.
 .SH "SEE ALSO"
 \fBcompute_ext_rays_polar\fP(1), \fBcompute_halfspaces\fP(1),
-\fBcompute_tangent_hypergraph\fP(1)
+\fBcompute_minimal_external_representations\fP(1),
+\fBcompute_tangent_hypergraph\fP(1), \fBcompute_tropical_complex\fP(1)
diff --git a/compute_ext_rays_polar.1 b/compute_ext_rays_polar.1
index 78a0a27..715f569 100644
--- a/compute_ext_rays_polar.1
+++ b/compute_ext_rays_polar.1
@@ -1,4 +1,4 @@
-.TH "compute_ext_rays_polar" "1" "May 2012" "TPLib 1.2" "User Commands"
+.TH "compute_ext_rays_polar" "1" "Feb 2013" "TPLib 1.3" "User Commands"
 .SH "NAME"
 compute_ext_rays_polar \- compute extreme rays of the polar of a tropical cone
 .SH "DESCRIPTION"
@@ -20,4 +20,5 @@ The constraints are not dynamically ordered during the execution.
 Display this list of options.
 .SH "SEE ALSO"
 \fBcompute_ext_rays\fP(1), \fBcompute_halfspaces\fP(1),
-\fBcompute_tangent_hypergraph\fP(1)
+\fBcompute_minimal_external_representations\fP(1),
+\fBcompute_tangent_hypergraph\fP(1), \fBcompute_tropical_complex\fP(1)
diff --git a/compute_halfspaces.1 b/compute_halfspaces.1
index 389b107..fcb4b9b 100644
--- a/compute_halfspaces.1
+++ b/compute_halfspaces.1
@@ -1,8 +1,8 @@
-.TH "compute_halfspaces" "1" "May 2012" "TPLib 1.2" "User Commands"
+.TH "compute_halfspaces" "1" "Feb 2013" "TPLib 1.3" "User Commands"
 .SH "NAME"
 compute_halfspaces \- use half-spaces to represent a tropical cone
 .SH "DESCRIPTION"
-Computes an external representation of a tropical cone given by a generating
+Computes a minimal representation of a tropical cone given by a generating
 set, by means of half-spaces.
 .SH "ARGUMENTS"
 .TP
@@ -20,4 +20,5 @@ The constraints are not dynamically ordered during the execution.
 Display this list of options.
 .SH "SEE ALSO"
 \fBcompute_ext_rays\fP(1), \fBcompute_ext_rays_polar\fP(1),
-\fBcompute_tangent_hypergraph\fP(1)
+\fBcompute_minimal_external_representations\fP(1),
+\fBcompute_tangent_hypergraph\fP(1), \fBcompute_tropical_complex\fP(1)
diff --git a/compute_minimal_external_representations.1 b/compute_minimal_external_representations.1
new file mode 100644
index 0000000..296f359
--- /dev/null
+++ b/compute_minimal_external_representations.1
@@ -0,0 +1,24 @@
+.TH "compute_minimal_external_representations" "1" "Feb 2013" "TPLib 1.3" "User Commands"
+.SH "NAME"
+compute_minimal_external_representations \- minimal external representation
+.SH "DESCRIPTION"
+Computes the structure underlying to the minimal external representations of
+a tropical cone given by a generating set.
+.SH "ARGUMENTS"
+.TP
+\fB\-numerical\-data\fP
+Set the type of numerical data used by the algorithm, one of: ocaml_int,
+ocaml_float, ocaml_big_int, ocaml_big_rat, zarith_int, and zarith_rat.
+.TP
+\fB\-min\-plus\fP
+Use the min\-plus semiring instead of the default max\-plus semiring.
+.TP
+\fB\-no\-ordering\fP
+The constraints are not dynamically ordered during the execution.
+.TP
+\fB\-help\fP, \fB\-\-help\fP
+Display this list of options.
+.SH "SEE ALSO"
+\fBcompute_ext_rays\fP(1), \fBcompute_ext_rays_polar\fP(1),
+\fBcompute_halfspaces\fP(1), \fBcompute_tangent_hypergraph\fP(1),
+\fBcompute_tropical_complex\fP(1)
diff --git a/compute_tangent_hypergraph.1 b/compute_tangent_hypergraph.1
index eb2a278..fdc4cff 100644
--- a/compute_tangent_hypergraph.1
+++ b/compute_tangent_hypergraph.1
@@ -1,4 +1,4 @@
-.TH "compute_tangent_hypergraph" "1" "May 2012" "TPLib 1.2" "User Commands"
+.TH "compute_tangent_hypergraph" "1" "Feb 2013" "TPLib 1.3" "User Commands"
 .SH "NAME"
 compute_tangent_hypergraph \- compute tangent hypergraph in a tropical cone
 .SH "DESCRIPTION"
@@ -22,4 +22,5 @@ Use the min\-plus semiring instead of the default max\-plus semiring.
 Display this list of options.
 .SH "SEE ALSO"
 \fBcompute_ext_rays\fP(1), \fBcompute_ext_rays_polar\fP(1),
-\fBcompute_halfspaces\fP(1)
+\fBcompute_halfspaces\fP(1), \fBcompute_minimal_external_representations\fP(1),
+\fBcompute_tropical_complex\fP(1)
diff --git a/compute_tropical_complex.1 b/compute_tropical_complex.1
new file mode 100644
index 0000000..15ee948
--- /dev/null
+++ b/compute_tropical_complex.1
@@ -0,0 +1,24 @@
+.TH "compute_tropical_complex" "1" "Feb 2013" "TPLib 1.3" "User Commands"
+.SH "NAME"
+compute_tropical_complex \- compute tropical complex of a set of vectors
+.SH "DESCRIPTION"
+Computes the tropical complex of a set of vectors with finite entries.
+.SH "ARGUMENTS"
+.TP
+\fB\-numerical\-data\fP
+Set the type of numerical data used by the algorithm, one of: ocaml_int,
+ocaml_float, ocaml_big_int, ocaml_big_rat, zarith_int, and zarith_rat.
+.TP
+\fB\-min\-plus\fP
+Use the min\-plus semiring instead of the default max\-plus semiring.
+.TP
+\fB\-polymake\-output\fP
+Output under polymake format.  Takes an argument, corresponding to name of the
+variable containing the complex.
+.TP
+\fB\-help\fP, \fB\-\-help\fP
+Display this list of options.
+.SH "SEE ALSO"
+\fBcompute_ext_rays\fP(1), \fBcompute_ext_rays_polar\fP(1),
+\fBcompute_halfspaces\fP(1), \fBcompute_minimal_external_representations\fP(1),
+\fBcompute_tangent_hypergraph\fP(1)
diff --git a/ocaml-tplib-gmp.patch b/ocaml-tplib-gmp.patch
new file mode 100644
index 0000000..a121adf
--- /dev/null
+++ b/ocaml-tplib-gmp.patch
@@ -0,0 +1,11 @@
+--- ./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" *)
diff --git a/ocaml-tplib.spec b/ocaml-tplib.spec
index db05f0c..3b199dd 100644
--- a/ocaml-tplib.spec
+++ b/ocaml-tplib.spec
@@ -3,27 +3,27 @@
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           ocaml-tplib
-Version:        1.2
-Release:        3%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Tropical Polyhedra Library
 
 License:        LGPLv2+
 URL:            https://gforge.inria.fr/projects/tplib
-Source0:        https://gforge.inria.fr/frs/download.php/30827/TPLib-%{version}.tar.gz
+Source0:        https://gforge.inria.fr/frs/download.php/32084/tplib-%{version}.tar.gz
 # Man pages written by Jerry James using text from the sources; i.e., I
 # contributed only the formatting.  Thus, the license and copyright for these
 # files is the same as for the sources.
 Source1:        compute_ext_rays.1
 Source2:        compute_ext_rays_polar.1
 Source3:        compute_halfspaces.1
-Source4:        compute_tangent_hypergraph.1
+Source4:        compute_minimal_external_representations.1
+Source5:        compute_tangent_hypergraph.1
+Source6:        compute_tropical_complex.1
 
 BuildRequires:  gmp-devel
-BuildRequires:  mpfr-devel
 BuildRequires:  ocaml
 BuildRequires:  ocaml-camlidl-devel
 BuildRequires:  ocaml-findlib-devel
-BuildRequires:  ocaml-mlgmpidl-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-zarith-devel
 
@@ -58,10 +58,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 Tools that use TPLib.
 
 %prep
-%setup -q -n TPLib-%{version}
-
-# This header file doesn't exist, and isn't needed anyway.
-sed -i '/zarith\.h/d' src/bindings/tplib_rational.c
+%setup -q -n tplib-%{version}
 
 %build
 %configure
@@ -79,7 +76,8 @@ strip %{buildroot}%{_bindir}/compute*
 strip %{buildroot}%{_libdir}/ocaml/tplib/*.cmxs
 
 mkdir -p %{buildroot}%{_mandir}/man1
-cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{buildroot}%{_mandir}/man1
+cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} \
+   %{buildroot}%{_mandir}/man1
 
 %check
 make test
@@ -105,6 +103,10 @@ _build/tests/test_tplib_rational
 %doc %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 19 2013 Jerry James <loganjerry at gmail.com> - 1.3-1
+- New upstream release
+- Upstream dropped MLGMPIDL support in favor of MLGMP, which we don't ship
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 4344789..e639e47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7484171d5c6d87ee964ab7e3a6119f08  TPLib-1.2.tar.gz
+861bde89a6790b78474c5578f821aea4  tplib-1.3.tar.gz


More information about the scm-commits mailing list