New upstream version 1.8.8.
This commit is contained in:
parent
b66866e56d
commit
c667791fb7
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/ocamlgraph-1.8.5.tar.gz
|
||||
/ocamlgraph-1.8.6.tar.gz
|
||||
/ocamlgraph-1.8.7.tar.gz
|
||||
/ocamlgraph-1.8.8.tar.gz
|
||||
|
@ -1,12 +1,8 @@
|
||||
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
||||
%global ocaml_destdir %{_libdir}/ocaml
|
||||
%if !%{opt}
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
|
||||
Name: ocaml-ocamlgraph
|
||||
Version: 1.8.7
|
||||
Release: 14%{?dist}
|
||||
Version: 1.8.8
|
||||
Release: 1%{?dist}
|
||||
Summary: OCaml library for arc and node graphs
|
||||
|
||||
License: LGPLv2 with exceptions
|
||||
@ -64,7 +60,7 @@ The %{name}-tools package contains graph editing tools for use with
|
||||
|
||||
%prep
|
||||
%setup -q -n %{libname}-%{version}
|
||||
%if ! %opt
|
||||
%ifnarch %{ocaml_native_compiler}
|
||||
%patch0
|
||||
%endif
|
||||
%patch1 -p1
|
||||
@ -82,7 +78,7 @@ done
|
||||
%build
|
||||
%configure
|
||||
|
||||
%if %opt
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%global opt_option OCAMLBEST=opt OCAMLOPT='ocamlopt.opt -g'
|
||||
%else
|
||||
%global opt_option OCAMLBEST=byte OCAMLC=ocamlc
|
||||
@ -92,7 +88,7 @@ make %{opt_option}
|
||||
make doc
|
||||
|
||||
%check
|
||||
%if %{opt}
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
make --no-print-directory check >& test
|
||||
diff -u test ocamlgraph-test.result
|
||||
%endif
|
||||
@ -101,7 +97,7 @@ diff -u test ocamlgraph-test.result
|
||||
%install
|
||||
mkdir -p %{buildroot}%{ocaml_destdir}
|
||||
make OCAMLFIND_DESTDIR=%{buildroot}%{ocaml_destdir} install-findlib
|
||||
%if %opt
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
install -m 0755 -p graph.cmxs %{buildroot}%{ocaml_destdir}/%{libname}
|
||||
%endif
|
||||
|
||||
@ -113,7 +109,7 @@ cp -p doc/* dox-devel/API
|
||||
|
||||
# Install the graph editing tools
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
%if %opt
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
install -m 0755 -p editor/editor.opt %{buildroot}/%{_bindir}/ocaml-graph-editor
|
||||
install -m 0755 -p dgraph/dgraph.opt %{buildroot}%{_bindir}/ocaml-graph-viewer
|
||||
install -m 0755 -p view_graph/viewgraph.opt \
|
||||
@ -130,7 +126,7 @@ install -m 0755 -p view_graph/viewgraph.byte \
|
||||
%doc CREDITS FAQ
|
||||
%license COPYING LICENSE
|
||||
%{ocaml_destdir}/%{libname}/
|
||||
%if %opt
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%exclude %{ocaml_destdir}/*/*.a
|
||||
%exclude %{ocaml_destdir}/*/*.cmxa
|
||||
%exclude %{ocaml_destdir}/*/*.cmx
|
||||
@ -141,7 +137,7 @@ install -m 0755 -p view_graph/viewgraph.byte \
|
||||
|
||||
%files devel
|
||||
%doc CHANGES README.adoc dox-devel/*
|
||||
%if %opt
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%{ocaml_destdir}/*/*.a
|
||||
%{ocaml_destdir}/*/*.cmxa
|
||||
%{ocaml_destdir}/*/*.cmx
|
||||
@ -155,14 +151,8 @@ install -m 0755 -p view_graph/viewgraph.byte \
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-14
|
||||
- Bump release and rebuild.
|
||||
|
||||
* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-13
|
||||
- Bump release and rebuild.
|
||||
|
||||
* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-12
|
||||
- Bump release and rebuild.
|
||||
* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-1
|
||||
- New upstream version 1.8.8.
|
||||
|
||||
* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-11
|
||||
- OCaml 4.06.0 rebuild.
|
||||
|
@ -1,6 +1,6 @@
|
||||
mkdir -p bin
|
||||
ocamlopt.opt -o bin/test-ts unix.cmxa graph.cmxa tests/test_topsort.ml
|
||||
ocaml graph.cma tests/test_clique.ml tests/check.ml
|
||||
ocaml -I . 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…
x
Reference in New Issue
Block a user