[ocaml] New upstream version 3.12.1.

[Richard W.M. Jones]

commit a334c49ca07aab4a926319bf24f6cabe7bca5b62
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Jan 6 12:38:15 2012 +0000

    New upstream version 3.12.1.

 .gitignore                                   |    1 +
 0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch |   66 --------------------------
 ocaml.spec                                   |   11 ++--
 sources                                      |    2 +-
 4 files changed, 7 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c3ec5ac..eb5c8bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ ocaml-3.11.2.tar.bz2
 /ocaml-3.12-refman.html.tar.gz
 /ocaml-3.12-refman.info.tar.gz
 /ocaml-3.12-refman.pdf
+/ocaml-3.12.1.tar.gz
diff --git a/ocaml.spec b/ocaml.spec
index c74f0b9..c87756e 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -1,8 +1,8 @@
 %global _default_patch_fuzz 2
 
 Name:           ocaml
-Version:        3.12.0
-Release:        7%{?dist}
+Version:        3.12.1
+Release:        1%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -24,9 +24,6 @@ Source6:        ocamlbyteinfo.ml
 Patch0:         ocaml-3.12.0-rpath.patch
 Patch1:         ocaml-user-cflags.patch
 
-# Fix for RHBZ#691896.  This is upstream in 3.12.1.
-Patch2:         0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
-
 # Patch from Debian for ARM (sent upstream).
 Patch3:         debian_patches_0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
 
@@ -221,7 +218,6 @@ man pages and info files.
 %setup -q -T -D -a 3 -n %{name}-%{version}
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .cflags
-%patch2 -p1 -b .rhbz691896
 %patch3 -p1 -b .arm-type-dir
 
 cp %{SOURCE2} refman.pdf
@@ -490,6 +486,9 @@ fi
 
 
 %changelog
+* Fri Jan  6 2012 Richard W.M. Jones <rjones at redhat.com> - 3.12.1-1
+- New upstream version 3.12.1.  This is a bugfix update.
+
 * Thu Dec  8 2011 Richard W.M. Jones <rjones at redhat.com> - 3.12.0-7
 - Allow this package to be compiled on platforms without native
   support and/or natdynlink, specifically ppc64.  This updates (and
diff --git a/sources b/sources
index c5e0fe3..39d3e67 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-3ba7cc65123c3579f14e7c726d3ee782  ocaml-3.12.0.tar.gz
 93cd91f525441eb7e94cc49b9b64bab0  ocaml-3.12-refman.html.tar.gz
 8cf24c4f69c6f9c9f9cc1edb9b18f6cb  ocaml-3.12-refman.info.tar.gz
 79fe5b86e0d6462e3e944fd8c47603ac  ocaml-3.12-refman.pdf
+814a047085f0f901ab7d8e3a4b7a9e65  ocaml-3.12.1.tar.gz