[ocaml-ocamlgraph] - New upstream version 1.6. - Rebuild for OCaml 3.12. - Remove obsolete patches and add patch to fix

[Richard W.M. Jones]

commit 1fbf4fd712b112d420f5d81f82d108076fc31f93
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Jan 10 13:35:00 2011 +0000

    - New upstream version 1.6.
    - Rebuild for OCaml 3.12.
    - Remove obsolete patches and add patch to fix install-findlib rule.

 .gitignore                                         |    1 +
 ocaml-ocamlgraph.spec                              |   21 +++++++++----------
 ocamlgraph-1.1-no-view-graph-doc.patch             |   11 ----------
 ocamlgraph-1.3-no-viewGraph_test.patch             |   11 ----------
 ...er.patch => ocamlgraph-1.6-install-extras.patch |   14 +++++++-----
 sources                                            |    2 +-
 6 files changed, 20 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d31fd3b..eab46f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ocamlgraph-1.3.tar.gz
+/ocamlgraph-1.6.tar.gz
diff --git a/ocaml-ocamlgraph.spec b/ocaml-ocamlgraph.spec
index 29f33c7..3508ef6 100644
--- a/ocaml-ocamlgraph.spec
+++ b/ocaml-ocamlgraph.spec
@@ -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 at 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 at 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
diff --git a/ocamlgraph-1.3-install-dgraph-and-viewer.patch b/ocamlgraph-1.6-install-extras.patch
similarity index 51%
rename from ocamlgraph-1.3-install-dgraph-and-viewer.patch
rename to ocamlgraph-1.6-install-extras.patch
index d290489..9027071 100644
--- a/ocamlgraph-1.3-install-dgraph-and-viewer.patch
+++ b/ocamlgraph-1.6-install-extras.patch
@@ -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 \
diff --git a/sources b/sources
index 79510c4..a0ccad0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9bcff267d041d3caec5f4f8c514f9cc1  ocamlgraph-1.3.tar.gz
+b66ad9942e5a3acddeeeaf69c09a0c26  ocamlgraph-1.6.tar.gz