From 73ce8fe3353a071dd7399d2cb52eb31184c33d62 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 7 Jun 2012 19:36:52 +0100
Subject: [PATCH] New upstream version 1.3.1.

---
 .gitignore                            |  1 +
 findlib-1.3.1-use-compiler-libs.patch | 11 +++++++++++
 ocaml-findlib.spec                    | 14 ++++++++++++--
 sources                               |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 findlib-1.3.1-use-compiler-libs.patch

diff --git a/.gitignore b/.gitignore
index 878045e..e4d900d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ findlib-1.2.5.tar.gz
 /findlib-1.2.6.tar.gz
 /findlib-1.2.7.tar.gz
 /findlib-1.2.8.tar.gz
+/findlib-1.3.1.tar.gz
diff --git a/findlib-1.3.1-use-compiler-libs.patch b/findlib-1.3.1-use-compiler-libs.patch
new file mode 100644
index 0000000..89e5f1d
--- /dev/null
+++ b/findlib-1.3.1-use-compiler-libs.patch
@@ -0,0 +1,11 @@
+--- findlib-1.3.1/src/findlib/Makefile.old	2012-06-07 19:40:09.366026562 +0100
++++ findlib-1.3.1/src/findlib/Makefile	2012-06-07 19:40:24.583320659 +0100
+@@ -116,7 +116,7 @@
+ 	$(OCAMLOPT) -c $<
+ 
+ .ml.cmo:
+-	$(OCAMLC) -g -c $<
++	$(OCAMLC) -I +compiler-libs -g -c $<
+ 
+ .mli.cmi:
+ 	$(OCAMLC) -c $<
diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index fec95e7..af4dfd9 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           ocaml-findlib
-Version:        1.2.8
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        Objective CAML package manager and build helper
 
@@ -16,9 +16,12 @@ Source0:        http://download.camlcity.org/download/findlib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
-BuildRequires:  ocaml >= 3.12.0-3
+Patch0:         findlib-1.3.1-use-compiler-libs.patch
+
+BuildRequires:  ocaml >= 4.00.0
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-labltk-devel
+BuildRequires:  ocaml-compiler-libs
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  m4, ncurses-devel
 BuildRequires:  gawk
@@ -45,6 +48,8 @@ developing applications that use %{name}.
 %prep
 %setup -q -n findlib-%{version}
 
+%patch0 -p1
+
 
 %build
 ocamlc -version
@@ -126,6 +131,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun  7 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-1
+- New upstream version 1.3.1.
+- This is required for programs using findlib and OCaml 4.00.0.
+- Add small patch to fix build of topfind.
+
 * Sat Apr 28 2012 Richard W.M. Jones <rjones@redhat.com> - 1.2.8-1
 - New upstream version 1.2.8.
 
diff --git a/sources b/sources
index 3f78632..f5ce2d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1da0fddf589ae62fa9b50799cd04c17  findlib-1.2.8.tar.gz
+e632bad87f1c7be9414a6b754232ba01  findlib-1.3.1.tar.gz