From ff34342be893d1c07311294130d3508de7e15669 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Thu, 4 Dec 2008 13:17:21 +0000
Subject: [PATCH] New upstream version 3.11.0+rc1.

---
 .cvsignore |  1 +
 ocaml.spec | 26 +++++++++-----------------
 sources    |  1 +
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4658716..793b0f9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ ocaml-3.11.0+beta1.tar.bz2
 ocaml-3.11-refman.html.tar.gz
 ocaml-3.11-refman.info.tar.gz
 ocaml-3.11-refman.pdf
+ocaml-3.11.0+rc1.tar.bz2
diff --git a/ocaml.spec b/ocaml.spec
index eb11fe9..bc5aac5 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -1,12 +1,8 @@
 %define _default_patch_fuzz 2
 
-# when beta/prerelease goes away, so also can these macros
-%define beta beta1
-%define beta_tag +%{beta}
-
 Name:           ocaml
 Version:        3.11.0
-Release:        0.4%{?beta:.%{beta}}%{?dist}
+Release:        0.5.rc1%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -15,7 +11,7 @@ License:        QPL and (LGPLv2+ with exceptions)
 
 URL:            http://www.ocaml.org
 
-Source0:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-%{version}%{?beta_tag}.tar.bz2
+Source0:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-%{version}+rc1.tar.bz2
 Source1:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.html.tar.gz
 Source2:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.pdf
 Source3:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.info.tar.gz
@@ -36,12 +32,6 @@ Patch3:         ocaml-3.11.0-ppc64.patch
 # A similar fix went upstream in 3.11.0:
 #Patch5:         ocaml-3.11-dev12-no-executable-stack.patch
 
-# This is a patch from upstream which fixes PR#4637, PR#4582.
-# http://camlcvs.inria.fr/cgi-bin/cvsweb/ocaml/stdlib/string.ml.diff?r1=text&tr1=1.29&r2=text&tr2=1.28
-# commonly manifested as errors thrown saying:
-# Invalid_argument("String.index_from")
-Patch6:         ocaml-3.11.0-string-index-from.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel
@@ -207,16 +197,15 @@ man pages and info files.
 
 
 %prep
-%setup -q -T -b 0 -n %{name}-%{version}%{?beta_tag}
-%setup -q -T -D -a 1 -n %{name}-%{version}%{?beta_tag}
-%setup -q -T -D -a 3 -n %{name}-%{version}%{?beta_tag}
+%setup -q -T -b 0 -n %{name}-%{version}+rc1
+%setup -q -T -D -a 1 -n %{name}-%{version}+rc1
+%setup -q -T -D -a 3 -n %{name}-%{version}+rc1
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .cflags
 #%patch2 -p1 -b .tclver
 %patch3 -p1 -b .ppc64
 #%patch4 -p1 -b .map32bit
 #%patch5 -p0 -b .noexecstack
-%patch6 -p1 -b .stringindexfrom
 
 cp %{SOURCE2} refman.pdf
 
@@ -457,7 +446,10 @@ fi
 
 
 %changelog
-* Mon Nov 24 2008 Richard W.M. Jones <rjnes@redhat.com> - 3.11.0-0.4.beta1
+* Thu Dec  4 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0-0.5.rc1
+- New upstream version 3.11.0+rc1.
+
+* Mon Nov 24 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0-0.4.beta1
 - Rebuild.
 
 * Thu Nov 20 2008 Rex Dieter <rdieter@fedoraproject.org> - 3.11.0-0.3.beta1
diff --git a/sources b/sources
index d92ada4..d780959 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@
 7e20778259f87ab5e7cb60d2a17c657c  ocaml-3.11-refman.html.tar.gz
 3fcfedf63a852f502a10eac547c9042d  ocaml-3.11-refman.info.tar.gz
 076a163e511e575fc384ad96394760a2  ocaml-3.11-refman.pdf
+232f1ba01266a95c707883f25ed918e5  ocaml-3.11.0+rc1.tar.bz2