[ocaml-ocamlgraph/f20] Backport 1.8.5 update to F-20.

[Jerry James]

commit 5da2b83c3c40ea04aaad2975356e26a6cf89a66f
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Mon Apr 21 16:00:50 2014 -0600

    Backport 1.8.5 update to F-20.

 .gitignore                                         |    2 +-
 ocaml-ocamlgraph.spec                              |   11 +++++++----
 ...ll.patch => ocamlgraph-1.8.5-byte-install.patch |    6 +++---
 sources                                            |    2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 393c029..d33da01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/ocamlgraph-1.8.4+dev.tar.gz
+/ocamlgraph-1.8.5.tar.gz
diff --git a/ocaml-ocamlgraph.spec b/ocaml-ocamlgraph.spec
index 1675b61..45b2019 100644
--- a/ocaml-ocamlgraph.spec
+++ b/ocaml-ocamlgraph.spec
@@ -5,17 +5,17 @@
 %endif
 
 Name:           ocaml-ocamlgraph
-Version:        1.8.4
+Version:        1.8.5
 Release:        1%{?dist}
 Summary:        OCaml library for arc and node graphs
 
 License:        LGPLv2 with exceptions
 URL:            http://ocamlgraph.lri.fr/
-Source0:        http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}+dev.tar.gz
+Source0:        http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz
 Source1:        ocamlgraph-test.result
 # When building the byte variant, do not try to install artifacts that were
 # not built.
-Patch0:         ocamlgraph-1.8.4-byte-install.patch
+Patch0:         ocamlgraph-1.8.5-byte-install.patch
 
 BuildRequires:  libart_lgpl-devel
 BuildRequires:  libgnomecanvas-devel
@@ -62,7 +62,7 @@ The %{name}-tools package contains graph editing tools for use with
 
 
 %prep
-%setup -q -n %{libname}-%{version}+dev
+%setup -q -n %{libname}-%{version}
 %if ! %opt
 %patch0
 %endif
@@ -153,6 +153,9 @@ install -m 0755 -p view_graph/viewgraph.byte \
 
 
 %changelog
+* Mon Apr 21 2014 Jerry James <loganjerry at gmail.com> - 1.8.5-1
+- New upstream release
+
 * Wed Feb 26 2014 Jerry James <loganjerry at gmail.com> - 1.8.4-1
 - New upstream release, 1.8.4+dev, where the "+dev" refers to a bug fix
   that was applied immediately after the 1.8.4 release
diff --git a/ocamlgraph-1.8.4-byte-install.patch b/ocamlgraph-1.8.5-byte-install.patch
similarity index 85%
rename from ocamlgraph-1.8.4-byte-install.patch
rename to ocamlgraph-1.8.5-byte-install.patch
index 63dde78..5bb5f73 100644
--- a/ocamlgraph-1.8.4-byte-install.patch
+++ b/ocamlgraph-1.8.5-byte-install.patch
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2014-02-07 13:12:54.000000000 -0700
-+++ Makefile.in	2014-02-25 20:00:00.000000000 -0700
-@@ -418,16 +418,13 @@
+--- Makefile.in.orig	2014-04-04 06:45:43.000000000 -0600
++++ Makefile.in	2014-04-21 12:00:00.000000000 -0600
+@@ -422,16 +422,13 @@
  ifeq (@LABLGNOMECANVAS@,yes)
  	$(OCAMLFIND) install ocamlgraph META \
  		$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
diff --git a/sources b/sources
index e49a492..f381dd1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ba9870d4dd309a168b7e3f4bfc83bcc  ocamlgraph-1.8.4+dev.tar.gz
+75dde65bfc3f9b07e795343d369aa84d  ocamlgraph-1.8.5.tar.gz