diff --git a/.gitignore b/.gitignore index 29e7e85..103acb1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/ocamlgraph-1.7.tar.gz +/ocamlgraph-1.8.1.tar.gz diff --git a/ocaml-ocamlgraph.spec b/ocaml-ocamlgraph.spec index 73af83c..b975a2e 100644 --- a/ocaml-ocamlgraph.spec +++ b/ocaml-ocamlgraph.spec @@ -16,7 +16,7 @@ %global debug_package %{nil} Name: ocaml-ocamlgraph -Version: 1.7 +Version: 1.8.1 Release: 1%{?dist} Summary: OCaml library for arc and node graphs @@ -28,7 +28,7 @@ Source0: http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz Source1: ocamlgraph-test.result # Fix the install-findlib rule, and install some extras. -Patch0: ocamlgraph-1.7-install-extras.patch +Patch0: ocamlgraph-1.8.1-install-extras.patch BuildRequires: libart_lgpl-devel BuildRequires: libgnomecanvas-devel @@ -129,6 +129,9 @@ cp -p doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/ %changelog +* Tue Oct 25 2011 Jerry James - 1.8.1-1 +- New upstream release + * Mon Jul 11 2011 Jerry James - 1.7-1 - New upstream release - Drop unnecessary spec file elements (BuildRoot, etc.) diff --git a/ocamlgraph-1.7-install-extras.patch b/ocamlgraph-1.7-install-extras.patch deleted file mode 100644 index 2dabef5..0000000 --- a/ocamlgraph-1.7-install-extras.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.in.orig 2011-02-23 01:35:33.000000000 -0700 -+++ Makefile.in 2011-07-07 10:34:10.340455498 -0600 -@@ -349,7 +349,11 @@ - $(OCAMLFIND) install ocamlgraph META \ - $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \ - graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \ -- $(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) \ -+ $(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/ocamlgraph-1.8.1-install-extras.patch b/ocamlgraph-1.8.1-install-extras.patch new file mode 100644 index 0000000..5d6cc3f --- /dev/null +++ b/ocamlgraph-1.8.1-install-extras.patch @@ -0,0 +1,17 @@ +--- Makefile.in.orig 2011-10-17 08:27:03.000000000 -0600 ++++ Makefile.in 2011-10-25 11:25:33.708625231 -0600 +@@ -349,8 +349,12 @@ + $(OCAMLFIND) install ocamlgraph META \ + $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \ + graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \ +- $(VIEWER_CMXLIB) $(VIEWER_CMOLIB) $(DGRAPH_CMXLIB) \ +- $(DGRAPH_CMOLIB) ++ $(VIEWER_CMILIB) $(VIEWER_CMXLIB) \ ++ $(VIEWER_CMXLIB:.cmx=.o) $(VIEWER_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 358a981..b6d0d56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30282965f0fdce3cd31a92e08fc2057b ocamlgraph-1.7.tar.gz +5aa256e9587a6d264d189418230af698 ocamlgraph-1.8.1.tar.gz