rpms/ocaml-ocamlgraph/F-12 ocamlgraph-1.3-no-viewGraph_test.patch, NONE, 1.1 ocaml-ocamlgraph.spec, 1.9, 1.10

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ocamlgraph/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28242

Modified Files:
	ocaml-ocamlgraph.spec 
Added Files:
	ocamlgraph-1.3-no-viewGraph_test.patch 
Log Message:
Backport version 1.3 from Rawhide (requested by David A. Wheeler).

ocamlgraph-1.3-no-viewGraph_test.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ocamlgraph-1.3-no-viewGraph_test.patch ---
--- 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)


Index: ocaml-ocamlgraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-12/ocaml-ocamlgraph.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-ocamlgraph.spec	8 Aug 2009 02:52:26 -0000	1.9
+++ ocaml-ocamlgraph.spec	5 Jan 2010 11:17:54 -0000	1.10
@@ -18,8 +18,8 @@
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 Name:           ocaml-ocamlgraph
-Version:        1.1
-Release:        1%{?dist}
+Version:        1.3
+Release:        2%{?dist}
 Summary:        OCaml library for arc and node graphs
 
 Group:          Development/Libraries
@@ -30,6 +30,7 @@ Source0:        http://ocamlgraph.lri.fr
 Source1:        ocamlgraph-test.result
 
 Patch0:         ocamlgraph-1.1-no-view-graph-doc.patch
+Patch1:         ocamlgraph-1.3-no-viewGraph_test.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
@@ -65,6 +66,7 @@ developing applications that use %{name}
 %setup -q -n ocamlgraph-%{version}
 
 %patch0 -p1
+%patch1 -p1
 
 cp %{SOURCE1} .
 
@@ -77,6 +79,7 @@ cp %{SOURCE1} .
 %else
 %define opt_option OCAMLBEST=byte OCAMLC=ocamlc
 %endif
+make depend
 make %{opt_option}
 make doc
 
@@ -131,6 +134,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jan 05 2010 Richard W.M. Jones <rjones at redhat.com> - 1.3-1
+- Backport version 1.3 from Rawhide (requested by David A. Wheeler).
+
 * Fri Aug 07 2009 Alan Dunn <amdunn at gmail.com> - 1.1-1
 - New upstream release 1.1.
 - Makefile patch updated (still not incorporated upstream).