rpms/ocaml-ocamlgraph
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- New upstream version 1.6.

Browse Source 
- Rebuild for OCaml 3.12.
- Remove obsolete patches and add patch to fix install-findlib rule.
This commit is contained in:
Richard W.M. Jones 2011-01-10 13:35:00 +00:00
parent 1e15d9bd69
commit 1fbf4fd712
6 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
ocamlgraph-1.3.tar.gz
/ocamlgraph-1.6.tar.gz

21
ocaml-ocamlgraph.spec
View File

@ -21,8 +21,8 @@
%endif
Name: ocaml-ocamlgraph
Version: 1.3
Release: 3%{?dist}
Version: 1.6
Release: 1%{?dist}
Summary: OCaml library for arc and node graphs
Group: Development/Libraries
@ -32,12 +32,8 @@ URL: http://ocamlgraph.lri.fr/
Source0: http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz
Source1: ocamlgraph-test.result
Patch0: ocamlgraph-1.1-no-view-graph-doc.patch
Patch1: ocamlgraph-1.3-no-viewGraph_test.patch
# Makefile does not install some files that other applications expect
# - difference comes in install-findlib
Patch2: ocamlgraph-1.3-install-dgraph-and-viewer.patch
# Fix the install-findlib rule, and install some extras.
Patch3: ocamlgraph-1.6-install-extras.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
@ -72,9 +68,7 @@ developing applications that use %{name}.
%prep
%setup -q -n ocamlgraph-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
cp %{SOURCE1} .
@ -143,6 +137,11 @@ rm -rf %{buildroot}
%changelog
* Mon Jan 10 2011 Richard W.M. Jones <rjones@redhat.com> - 1.6-1
- New upstream version 1.6.
- Rebuild for OCaml 3.12.
- Remove obsolete patches and add patch to fix install-findlib rule.
* Wed Feb 10 2010 Alan Dunn <amdunn@gmail.com> - 1.3-3
- Include files (including .cmo files) and install more files that are
needed by other applications (eg: Frama-C) that depend on

11
ocamlgraph-1.1-no-view-graph-doc.patch
View File

@ -1,11 +0,0 @@
--- ocamlgraph-1.1/Makefile.in.orig 2009-08-07 22:07:11.000000000 -0400
+++ ocamlgraph-1.1/Makefile.in 2009-08-07 22:07:29.000000000 -0400
@@ -298,7 +298,7 @@
mkdir -p doc
rm -f doc/*
$(OCAMLDOC) -d doc -html $(INCLUDES) $(DOC_SRC)
- $(MAKE) -C $(VIEWER_DIR) doc
+# $(MAKE) -C $(VIEWER_DIR) doc
# literate programming
$(NAME).tex: $(DOC_SRC)

11
ocamlgraph-1.3-no-viewGraph_test.patch
View File

@ -1,11 +0,0 @@
--- ocamlgraph-1.3.orig/Makefile.in 2009-10-02 12:48:39.000000000 +0100
+++ ocamlgraph-1.3.no-vg/Makefile.in 2009-10-08 14:02:34.396309817 +0100
@@ -144,7 +144,7 @@
viewer: $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.$(OCAMLBEST)
-VIEWER_CMO=viewGraph_core viewGraph_select viewGraph_utils viewGraph_test
+VIEWER_CMO=viewGraph_core viewGraph_select viewGraph_utils
VIEWER_CMO:=$(patsubst %,$(VIEWER_DIR)/%.cmo, $(VIEWER_CMO))
VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx)
VIEWER_CMI=$(VIEWER_CMO:.cmo=.cmi)

14
ocamlgraph-1.3-install-dgraph-and-viewer.patch → ocamlgraph-1.6-install-extras.patch
View File

@ -1,13 +1,15 @@
--- ocamlgraph-1.3-old/Makefile.in 2009-10-02 07:48:39.000000000 -0400
+++ ocamlgraph-1.3/Makefile.in 2010-01-17 10:20:12.076904950 -0500
@@ -335,7 +335,9 @@
--- ocamlgraph-1.6.old/Makefile.in 2010-12-13 08:47:38.000000000 +0000
+++ ocamlgraph-1.6.fix/Makefile.in 2011-01-10 13:31:34.604320516 +0000
@@ -352,7 +352,11 @@
$(OCAMLFIND) install ocamlgraph META \
$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \
- $(VIEWER_CMX) $(VIEWER_CMO) $(DGRAPH_CMX) $(DGRAPH_CMO)
+ $(VIEWER_CMX) $(VIEWER_CMO) $(DGRAPH_CMX) $(DGRAPH_CMO) \
- $(VIEWER_CMXLIB) $(VIEWER_CMOLIB) $(DGRAPH_CMX) $(DGRAPH_CMO)
+ $(VIEWER_CMXLIB) $(VIEWER_CMOLIB) \
+ $(VIEWER_CMILIB) $(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) $(VIEWER_CMOLIB) \
+ $(DGRAPH_CMILIB) $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o) $(DGRAPH_CMOLIB)
+ $(DGRAPH_CMILIB) $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o) $(DGRAPH_CMOLIB) \
+ $(filter-out dgraph/dGraphTest.cmx, $(DGRAPH_CMX)) \
+ $(filter-out dgraph/dGraphTest.cmo, $(DGRAPH_CMO))
else
$(OCAMLFIND) install ocamlgraph META \
$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \

2
sources
View File

@ -1 +1 @@
9bcff267d041d3caec5f4f8c514f9cc1 ocamlgraph-1.3.tar.gz
b66ad9942e5a3acddeeeaf69c09a0c26 ocamlgraph-1.6.tar.gz