[coccinelle] Remove sexplib patch which is no longer required by upstream.

[Richard W.M. Jones]

commit ccb965a8770178ec911e11836908ee9401821f5a
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Jul 31 09:37:51 2012 +0100

    Remove sexplib patch which is no longer required by upstream.
    
    - Make sure MAKEFLAGS is also unset to prevent parallel builds (bug
      reported upstream).

 ...e-1.0.0-rc4-remove-use-of-hashtbl_of_sexp.patch |   42 --------------------
 coccinelle.spec                                    |   19 +++++----
 2 files changed, 10 insertions(+), 51 deletions(-)
---
diff --git a/coccinelle.spec b/coccinelle.spec
index 1b2a89e..9eecbd7 100644
--- a/coccinelle.spec
+++ b/coccinelle.spec
@@ -8,7 +8,7 @@
 
 Name:           coccinelle
 Version:        1.0.0
-Release:        0.rc14.3%{?dist}
+Release:        0.rc14.4%{?dist}
 Summary:        Semantic patching for Linux (spatch)
 
 Group:          Development/Libraries
@@ -19,11 +19,6 @@ ExcludeArch:    sparc64 s390 s390x ppc64
 URL:            http://coccinelle.lip6.fr/
 Source0:        http://coccinelle.lip6.fr/distrib/%{name}-%{version}-rc14.tgz
 
-# Non-upstream patch to remove use of a couple of functions from the
-# forked ocaml sexpr project, so we can use the Fedora one instead.
-# See: http://lists.diku.dk/pipermail/cocci/2011-January/001439.html
-Patch0:         coccinelle-1.0.0-rc4-remove-use-of-hashtbl_of_sexp.patch
-
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
@@ -73,8 +68,6 @@ The %{name}-examples package contains examples for %{name}.
 %prep
 %setup -q -n %{name}-%{version}-rc14
 
-%patch0 -p1
-
 # Remove .cvsignore files.
 find -name .cvsignore -delete
 
@@ -94,7 +87,9 @@ done
   -e 's,SHAREDIR=.*,SHAREDIR=%{_datadir}/%{name},' \
   Makefile.config
 
-# Note that _smp_mflags breaks the build.
+# Note that _smp_mflags or MAKEFLAGS=-jN breaks the build.
+unset MAKEFLAGS
+
 %if !%opt
 make all EXTLIBDIR=`ocamlc -where`/extlib
 %else
@@ -131,6 +126,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/spatch.byte
 %check
 export COCCINELLE_HOME=$RPM_BUILD_ROOT%{_datadir}/coccinelle
 export LD_LIBRARY_PATH=.
+
 # Run --help to check the command works in general.
 $RPM_BUILD_ROOT%{_bindir}/spatch --help
 
@@ -164,6 +160,11 @@ $RPM_BUILD_ROOT%{_bindir}/spatch -sp_file demos/simple.cocci demos/simple.c
 
 
 %changelog
+* Tue Jul 31 2012 Richard W.M. Jones <rjones at redhat.com> - 1.0.0-0.rc14.4
+- Remove sexplib patch which is no longer required by upstream.
+- Make sure MAKEFLAGS is also unset to prevent parallel builds (bug
+  reported upstream).
+
 * Mon Jul 30 2012 Richard W.M. Jones <rjones at redhat.com> - 1.0.0-0.rc14.3
 - Confirmed with upstream that *.so files are no longer required.
 - Re-enable move of python libs to python library dir.