New upstream release.
Also reenable documentation generation.
This commit is contained in:
parent
09e67b9253
commit
57eba89f14
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/ocamlgraph-1.8.5.tar.gz
|
||||
/ocamlgraph-1.8.6.tar.gz
|
||||
|
@ -4,31 +4,25 @@
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
|
||||
# Disable documentation. In ocamldoc 4.02 we get the error
|
||||
# analyse_module: parsetree and typedtree don't match.
|
||||
%global documentation 0
|
||||
|
||||
Name: ocaml-ocamlgraph
|
||||
Version: 1.8.5
|
||||
Release: 10%{?dist}
|
||||
Version: 1.8.6
|
||||
Release: 1%{?dist}
|
||||
Summary: OCaml library for arc and node graphs
|
||||
|
||||
License: LGPLv2 with exceptions
|
||||
URL: http://ocamlgraph.lri.fr/
|
||||
URL: http://ocamlgraph.lri.fr/index.en.html
|
||||
Source0: http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz
|
||||
Source1: ocamlgraph-test.result
|
||||
# When building the byte variant, do not try to install artifacts that were
|
||||
# not built.
|
||||
Patch0: ocamlgraph-1.8.5-byte-install.patch
|
||||
Patch0: ocamlgraph-1.8.6-byte-install.patch
|
||||
|
||||
BuildRequires: libart_lgpl-devel
|
||||
BuildRequires: libgnomecanvas-devel
|
||||
BuildRequires: ocaml
|
||||
BuildRequires: ocaml-findlib
|
||||
BuildRequires: ocaml-lablgtk-devel
|
||||
%if %documentation
|
||||
BuildRequires: ocaml-ocamldoc
|
||||
%endif
|
||||
|
||||
%global __requires_exclude ocaml\\\(Sig\\\)
|
||||
%global libname %(sed -e 's/^ocaml-//' <<< %{name})
|
||||
@ -94,9 +88,7 @@ done
|
||||
%endif
|
||||
make depend
|
||||
make %{opt_option}
|
||||
%if %documentation
|
||||
make doc
|
||||
%endif
|
||||
|
||||
%check
|
||||
make --no-print-directory check >& test
|
||||
@ -114,9 +106,7 @@ install -m 0755 -p graph.cmxs %{buildroot}%{ocaml_destdir}/%{libname}
|
||||
mkdir -p dox-devel/examples
|
||||
mkdir -p dox-devel/API
|
||||
cp -p examples/*.ml dox-devel/examples
|
||||
%if %documentation
|
||||
cp -p doc/* dox-devel/API
|
||||
%endif
|
||||
|
||||
# Install the graph editing tools
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
@ -162,6 +152,10 @@ install -m 0755 -p view_graph/viewgraph.byte \
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Mar 18 2015 Jerry James <loganjerry@gmail.com> - 1.8.6-1
|
||||
- New upstream release
|
||||
- Reenable documentation generation
|
||||
|
||||
* Mon Feb 16 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.5-10
|
||||
- ocaml-4.02.1 rebuild.
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
--- Makefile.in.orig 2014-04-04 06:45:43.000000000 -0600
|
||||
+++ Makefile.in 2014-04-21 12:00:00.000000000 -0600
|
||||
@@ -422,16 +422,13 @@
|
||||
--- Makefile.in.orig 2015-01-23 00:24:01.000000000 -0700
|
||||
+++ Makefile.in 2015-03-17 20:00:00.000000000 -0600
|
||||
@@ -426,16 +426,13 @@
|
||||
ifeq (@LABLGNOMECANVAS@,yes)
|
||||
$(OCAMLFIND) install ocamlgraph META \
|
||||
$(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
|
||||
$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
|
||||
- graph$(OBJEXT) graph$(LIBEXT) graph.cmx graph.cmo graph.cmi \
|
||||
- $(CMA) $(CMXA) \
|
||||
@ -14,7 +14,7 @@
|
||||
+ $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
|
||||
+ $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB)
|
||||
else
|
||||
$(OCAMLFIND) install ocamlgraph META \
|
||||
$(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
|
||||
$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
|
||||
- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
|
||||
+ graph.cmo graph.cmi $(CMA)
|
@ -1,30 +1,6 @@
|
||||
mkdir -p bin
|
||||
ocamlopt.opt -o bin/test-ts unix.cmxa graph.cmxa tests/test_topsort.ml
|
||||
ocaml graph.cma tests/check.ml
|
||||
iter:
|
||||
pre 3
|
||||
pre 5
|
||||
pre 4
|
||||
pre 2
|
||||
post 2
|
||||
post 4
|
||||
post 5
|
||||
pre 6
|
||||
post 6
|
||||
post 3
|
||||
prefix:
|
||||
pre 3
|
||||
pre 6
|
||||
pre 5
|
||||
pre 4
|
||||
pre 2
|
||||
step:
|
||||
visit 6
|
||||
visit 5
|
||||
visit 4
|
||||
visit 2
|
||||
visit 3
|
||||
visit 1
|
||||
ocaml graph.cma tests/test_clique.ml tests/check.ml
|
||||
bin/test-ts 10
|
||||
0 1 2
|
||||
x=0 y=0 num(x)=1 num(y)=1
|
||||
|
Loading…
Reference in New Issue
Block a user