[ocaml-ocamlgraph] New upstream release.

Jerry James jjames at fedoraproject.org
Fri Oct 28 16:57:43 UTC 2011


commit c1691efb93f99b7c96e28f33f8fac8f2d35cd297
Author: Jerry James <loganjerry at gmail.com>
Date:   Fri Oct 28 10:57:20 2011 -0600

    New upstream release.

 .gitignore                            |    2 +-
 ocaml-ocamlgraph.spec                 |    7 +++++--
 ocamlgraph-1.7-install-extras.patch   |   15 ---------------
 ocamlgraph-1.8.1-install-extras.patch |   17 +++++++++++++++++
 sources                               |    2 +-
 5 files changed, 24 insertions(+), 19 deletions(-)
---
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 <loganjerry at gmail.com> - 1.8.1-1
+- New upstream release
+
 * Mon Jul 11 2011 Jerry James <loganjerry at gmail.com> - 1.7-1
 - New upstream release
 - Drop unnecessary spec file elements (BuildRoot, etc.)
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


More information about the scm-commits mailing list