diff --git a/.cvsignore b/.cvsignore index 5c1a45c..d31fd3b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ocamlgraph-1.1.tar.gz +ocamlgraph-1.3.tar.gz diff --git a/ocaml-ocamlgraph.spec b/ocaml-ocamlgraph.spec index cdcc49c..d02f37d 100644 --- a/ocaml-ocamlgraph.spec +++ b/ocaml-ocamlgraph.spec @@ -18,7 +18,7 @@ %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh Name: ocaml-ocamlgraph -Version: 1.1 +Version: 1.3 Release: 1%{?dist} Summary: OCaml library for arc and node graphs @@ -30,6 +30,7 @@ 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 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,10 @@ rm -rf %{buildroot} %changelog +* Thu Oct 8 2009 Richard W.M. Jones - 1.3-1 +- New upstream release 1.3. +- A slightly different viewGraph-related patch is required for this release. + * Fri Aug 07 2009 Alan Dunn - 1.1-1 - New upstream release 1.1. - Makefile patch updated (still not incorporated upstream). diff --git a/ocamlgraph-1.3-no-viewGraph_test.patch b/ocamlgraph-1.3-no-viewGraph_test.patch new file mode 100644 index 0000000..e89a0e4 --- /dev/null +++ b/ocamlgraph-1.3-no-viewGraph_test.patch @@ -0,0 +1,11 @@ +--- 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) diff --git a/sources b/sources index fa1436e..79510c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62cf4b0c273db2af1dbf4f8fac957bfc ocamlgraph-1.1.tar.gz +9bcff267d041d3caec5f4f8c514f9cc1 ocamlgraph-1.3.tar.gz