[ocaml-extlib] New upstream version 1.6.1.

[Richard W.M. Jones]

commit 4523511763b4111bc8248cd0191b339bd94d6c74
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Jul 17 15:22:54 2014 +0100

    New upstream version 1.6.1.
    
    - Rebuild for OCaml 4.02.0 beta.

 extlib-enable-debug.patch |   44 --------------------------------------------
 ocaml-extlib.spec         |   26 ++++++++++++--------------
 sources                   |    2 +-
 3 files changed, 13 insertions(+), 59 deletions(-)
---
diff --git a/ocaml-extlib.spec b/ocaml-extlib.spec
index 890d284..aa4b223 100644
--- a/ocaml-extlib.spec
+++ b/ocaml-extlib.spec
@@ -1,8 +1,6 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-
 Name:           ocaml-extlib
-Version:        1.5.4
-Release:        2%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        OCaml ExtLib additions to the standard library
 License:        LGPLv2+ with exceptions
 
@@ -12,7 +10,6 @@ Source0:        http://ocaml-extlib.googlecode.com/files/extlib-%{version}.tar.g
 ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         extlib-install.patch
-Patch1:         extlib-enable-debug.patch
 
 # Omitted from source tarball, I think.  This is copied from 1.5.2.
 Source1:        odoc_style.css
@@ -48,7 +45,6 @@ developing applications that use %{name}.
 cp %{SOURCE1} .
 
 %patch0 -p1
-%patch1 -p1
 
 
 %build
@@ -56,16 +52,13 @@ cp %{SOURCE1} .
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 extlibdir=$RPM_BUILD_ROOT%{_libdir}/ocaml/extlib
 mkdir -p $extlibdir
 
 # This does the build and install.
-%if %opt
-ocaml install.ml -d $extlibdir -b -n -doc
-%else
-ocaml install.ml -d $extlibdir -b -doc
+ocaml install.ml -d $extlibdir -b -min -doc \
+%ifarch %{ocaml_native_compiler}
+  -n
 %endif
 
 # Copy the interface files, and extLib.ml which is really an interface.
@@ -80,7 +73,7 @@ mv $extlibdir/extlib-doc .
 %files
 %doc README.txt LICENSE
 %{_libdir}/ocaml/extlib
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/extlib/*.a
 %exclude %{_libdir}/ocaml/extlib/*.cmxa
 %exclude %{_libdir}/ocaml/extlib/*.cmx
@@ -91,7 +84,7 @@ mv $extlibdir/extlib-doc .
 
 %files devel
 %doc extlib-doc/*
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/extlib/*.a
 %{_libdir}/ocaml/extlib/*.cmxa
 %{_libdir}/ocaml/extlib/*.cmx
@@ -101,6 +94,11 @@ mv $extlibdir/extlib-doc .
 
 
 %changelog
+* Thu Jul 17 2014 Richard W.M. Jones <rjones at redhat.com> - 1.6.1-1
+- New upstream version 1.6.1.
+- Rebuild for OCaml 4.02.0 beta.
+- Remove enable debug patch which is now upstream.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 09df9a2..a9f597a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-329041625309b9e49051e5b097a9185d  extlib-1.5.4.tar.gz
+5643237a6410dc915347956cff97df86  extlib-1.6.1.tar.gz