New upstream version: 4.02.2.

- No need for a mass rebuild, since this version is identical to RC1.

0001-Don-t-ignore-.-configure-it-s-a-real-git-file.patch

@@ -1,4 +1,4 @@
-From b57c7d76ec960e35a6b227f8944e5956cb9b381b Mon Sep 17 00:00:00 2001
+From 6fbdb9e95ecd4654067565afe0c0b12fbeed3336 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 24 Jun 2014 22:29:38 +0100
 Subject: [PATCH 01/16] Don't ignore ./configure, it's a real git file.

0002-Ensure-empty-compilerlibs-directory-is-created-by-gi.patch

@@ -1,4 +1,4 @@
-From 5afec587989790c5d3f8e0c215672d27aad6d6fe Mon Sep 17 00:00:00 2001
+From 3cecfa8e2765a4f1a126af37ddb77ad67c3f6720 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 7 Jun 2012 15:36:16 +0100
 Subject: [PATCH 02/16] Ensure empty compilerlibs/ directory is created by git.

0003-Don-t-add-rpaths-to-libraries.patch

@@ -1,4 +1,4 @@
-From 738c7f82c8b5413d83b1599235cebada4bd022c0 Mon Sep 17 00:00:00 2001
+From c8084922e188649becfe1e8bbe89b7fab0de6dd0 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 24 Jun 2014 10:00:15 +0100
 Subject: [PATCH 03/16] Don't add rpaths to libraries.

0004-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch

@@ -1,4 +1,4 @@
-From 15662574d75d041cc3a3a824ac70d6e78ecbb6d0 Mon Sep 17 00:00:00 2001
+From bfcc9876923963085d23537ca444469362673889 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 29 May 2012 20:40:36 +0100
 Subject: [PATCH 04/16] ocamlbyteinfo, ocamlplugininfo: Useful utilities from

0005-configure-Allow-user-defined-C-compiler-flags.patch

@@ -1,4 +1,4 @@
-From bf5117d9018ef5fe22e3ca7ac932eb0d31905028 Mon Sep 17 00:00:00 2001
+From 67b0b755b208027600255e379f98cdd8a919c7aa Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 29 May 2012 20:44:18 +0100
 Subject: [PATCH 05/16] configure: Allow user defined C compiler flags.

0006-Add-support-for-ppc64.patch

@@ -1,4 +1,4 @@
-From d6961d937fdb97bc119d31a2d3919a380cdc2b4a Mon Sep 17 00:00:00 2001
+From 83b653b6b163018086c0d9d66d02feb5edeb44d1 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 29 May 2012 20:47:07 +0100
 Subject: [PATCH 06/16] Add support for ppc64.

0007-ppc64-Update-for-OCaml-4.02.0.patch

@@ -1,4 +1,4 @@
-From 755d197c3eca97f8b690d49917a42ef4c7287ce2 Mon Sep 17 00:00:00 2001
+From cec09000c6659261e90310c5eff81b936849edf0 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 24 Oct 2014 12:59:23 +0200
 Subject: [PATCH 07/16] ppc64: Update for OCaml 4.02.0.

0008-Add-support-for-ppc64le.patch

@@ -1,4 +1,4 @@
-From 7a80efaf43d1832e9a53508835df61c0d43d1105 Mon Sep 17 00:00:00 2001
+From 5a2495689fcb11c4ed690008f4eab7dfc51d89ef Mon Sep 17 00:00:00 2001
 From: Michel Normand <normand@linux.vnet.ibm.com>
 Date: Tue, 18 Mar 2014 09:15:47 -0400
 Subject: [PATCH 08/16] Add support for ppc64le.

0009-ppc64le-Update-for-OCaml-4.02.0.patch

@@ -1,4 +1,4 @@
-From c7ff29a506205aeb9c398e08bfd9c84954709c72 Mon Sep 17 00:00:00 2001
+From 1a1d2ae928bcc88591502414a4167865da2db93a Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 24 Oct 2014 12:59:23 +0200
 Subject: [PATCH 09/16] ppc64le: Update for OCaml 4.02.0.

0010-arm-arm64-Mark-stack-as-non-executable.patch

@@ -1,4 +1,4 @@
-From a917e3fed4c915c07b01ee07c17aeefd5500cd74 Mon Sep 17 00:00:00 2001
+From b2b2dd82e4aa60307ba2f98c142dd2980bf4dc18 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 10 May 2014 03:20:35 -0400
 Subject: [PATCH 10/16] arm, arm64: Mark stack as non-executable.

0011-arg-Add-no_arg-and-get_arg-helper-functions.patch

@@ -1,4 +1,4 @@
-From bd549d61c9f6b2d20261afba90b33eb96612b7d6 Mon Sep 17 00:00:00 2001
+From ee670da51f4d7763f607e456186c52e72a09a929 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 1 Apr 2014 11:17:07 +0100
 Subject: [PATCH 11/16] arg: Add no_arg and get_arg helper functions.

0012-arg-Allow-flags-such-as-flag-arg-as-well-as-flag-arg.patch

@@ -1,4 +1,4 @@
-From a743fad54d002ab6db941cfe249bfcefb55ae6f5 Mon Sep 17 00:00:00 2001
+From 94a567b59750a3765140a6c8bd41223f5ecf6220 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 1 Apr 2014 11:21:40 +0100
 Subject: [PATCH 12/16] arg: Allow flags such as --flag=arg as well as --flag

0013-PR-6517-use-ISO-C99-types-u-int-32-64-_t-in-preferen.patch

@@ -1,4 +1,4 @@
-From 7fd0da10005641c51e7b69f47a4255b7321424d2 Mon Sep 17 00:00:00 2001
+From b6ae488dba765380975d71a03c5afdd02c4b5c58 Mon Sep 17 00:00:00 2001
 From: Xavier Leroy <xavier.leroy@inria.fr>
 Date: Wed, 27 Aug 2014 09:58:33 +0000
 Subject: [PATCH 13/16] PR#6517: use ISO C99 types {,u}int{32,64}_t in

0014-ppc-ppc64-ppc64le-Mark-stack-as-non-executable.patch

@@ -1,4 +1,4 @@
-From 03f9a1532f4559bdd8da5edb9915d058f380d633 Mon Sep 17 00:00:00 2001
+From 51d003033bc15d215a6860714190edacecd724ab Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 11 Sep 2014 14:49:54 +0100
 Subject: [PATCH 14/16] ppc, ppc64, ppc64le: Mark stack as non-executable.

0015-ppc64-ppc64le-proc-Interim-definitions-for-op_is_pur.patch

@@ -1,4 +1,4 @@
-From 812ed668f8d37e1153552535070a0673772a2aea Mon Sep 17 00:00:00 2001
+From e1dbbb661405f35600d78f16a0a729a8ac014f61 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 24 Oct 2014 10:10:54 +0100
 Subject: [PATCH 15/16] ppc64/ppc64le: proc: Interim definitions for op_is_pure

0016-ppc64le-Fix-calling-convention-of-external-functions.patch

@@ -1,4 +1,4 @@
-From c1ebccc0e1250d3efc303819b383f713132e66f8 Mon Sep 17 00:00:00 2001
+From 4198d84ca53b4760269abe7bfbecf9ecb853a303 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 28 May 2015 16:13:40 -0400
 Subject: [PATCH 16/16] ppc64le: Fix calling convention of external functions

ocaml.spec

@@ -17,7 +17,7 @@
 
 Name:           ocaml
 Version:        4.02.2
-Release:        0.rc1.1%{?dist}
+Release:        1%{?dist}
 
 Summary:        OCaml compiler and programming environment
 
@@ -25,9 +25,7 @@ License:        QPL and (LGPLv2+ with exceptions)
 
 URL:            http://www.ocaml.org
 
-# There's no 4.02.2+rc1 tarball, but you can grab it from github here:
-# https://github.com/ocaml/ocaml/tarball/4.02.2+rc1
-Source0:        ocaml-ocaml-4.02.2-rc1-0-g2eb6db8.tar.gz
+Source0:        http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-%{version}.tar.gz
 Source1:        http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02-refman-html.tar.gz
 Source2:        http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02-refman.pdf
 Source3:        http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02-refman.info.tar.gz
@@ -194,12 +192,9 @@ may not be portable between versions.
 
 
 %prep
-%setup -q -T -b 0 -n ocaml-ocaml-2eb6db8
-%setup -q -T -D -a 1 -n ocaml-ocaml-2eb6db8
-%setup -q -T -D -a 3 -n ocaml-ocaml-2eb6db8
-#%setup -q -T -b 0 -n %{name}-%{version}
-#%setup -q -T -D -a 1 -n %{name}-%{version}
-#%setup -q -T -D -a 3 -n %{name}-%{version}
+%setup -q -T -b 0 -n %{name}-%{version}
+%setup -q -T -D -a 1 -n %{name}-%{version}
+%setup -q -T -D -a 3 -n %{name}-%{version}
 cp %{SOURCE2} refman.pdf
 
 git init
@@ -428,6 +423,10 @@ fi
 
 
 %changelog
+* Tue Jun 23 2015 Richard W.M. Jones <rjones@redhat.com> - 4.02.2-1
+- New upstream version: 4.02.2.
+- No need for a mass rebuild, since this version is identical to RC1.
+
 * Tue Jun 16 2015 Richard W.M. Jones <rjones@redhat.com> - 4.02.2-0.rc1.1
 - New upstream version: 4.02.2+rc1.
 - Dropped two aarch64 patches which are now included upstream.

sources

@@ -1,4 +1,4 @@
 20b691d71d36df69f9cb16ab4521ed49  ocaml-4.02-refman-html.tar.gz
 265b7db123e925e8b7b70ca2266b4206  ocaml-4.02-refman.info.tar.gz
 1d683029a6ef48e34cc24eb1982cdd05  ocaml-4.02-refman.pdf
-5444ee57d65d457d3524d293a51f3ae8  ocaml-ocaml-4.02.2-rc1-0-g2eb6db8.tar.gz
+359ad0ef89717341767142f2a4d050b2  ocaml-4.02.2.tar.gz