[coccinelle] - Update to 1.0.0-rc4. - Requires ocaml-findlib (RHBZ#725415). - Non-upstream patch to remove use of

[Richard W.M. Jones]

commit ebd3f9acedd445787461a1de9927d9262f3f3f6c
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Jul 25 13:36:36 2011 +0100

    - Update to 1.0.0-rc4.
    - Requires ocaml-findlib (RHBZ#725415).
    - 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
    - Include a new manpage in section 3.

 .gitignore      |    1 +
 coccinelle.spec |   29 ++++++++++++++++++++++++-----
 sources         |    2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5b5c6dd..1099d74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ coccinelle-0.2.3rc6.tgz
 /coccinelle-0.2.5-rc1.tgz
 /coccinelle-0.2.5-rc4.tgz
 /coccinelle-0.2.5-rc9.tgz
+/coccinelle-1.0.0-rc4.tgz
diff --git a/coccinelle.spec b/coccinelle.spec
index 3d8016f..f60919f 100644
--- a/coccinelle.spec
+++ b/coccinelle.spec
@@ -7,8 +7,8 @@
 %endif
 
 Name:           coccinelle
-Version:        0.2.5
-Release:        0.rc9.1%{?dist}
+Version:        1.0.0
+Release:        0.rc4.1%{?dist}
 Summary:        Semantic patching for Linux (spatch)
 
 Group:          Development/Libraries
@@ -18,7 +18,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x ppc64
 
 URL:            http://coccinelle.lip6.fr/
-Source0:        http://coccinelle.lip6.fr/distrib/%{name}-%{version}-rc9.tgz
+Source0:        http://coccinelle.lip6.fr/distrib/%{name}-%{version}-rc4.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
@@ -31,6 +36,9 @@ BuildRequires:  chrpath
 
 %global __ocaml_requires_opts -i Ast_c -i Token_c -i Type_cocci -i Ast_cocci -i Common -i Oassocb -i ANSITerminal -i Oseti -i Sexplib -i Oassoch -i Setb -i Oassoc_buffer -i Ograph2way -i SetPt -i Mapb -i Dumper -i Osetb -i Flag
 
+# RHBZ#725415.
+Requires:       ocaml-findlib
+
 
 %description
 Coccinelle is a tool to utilize semantic patches for manipulating C
@@ -60,7 +68,9 @@ The %{name}-examples package contains examples for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc9
+%setup -q -n %{name}-%{version}-rc4
+
+%patch0 -p1
 
 # Remove .cvsignore files.
 find -name .cvsignore -delete
@@ -135,7 +145,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/spatch
 %{_datadir}/%{name}/
 %{python_sitelib}/coccilib/
-%{_mandir}/man1/*.1.gz
+%{_mandir}/man1/*.1*
+%{_mandir}/man3/*.3*
 %{_libdir}/*.so
 %if !%opt
 %config(noreplace) /etc/prelink.conf.d/%{name}.conf
@@ -153,6 +164,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 25 2011 Richard W.M. Jones <rjones at redhat.com> - 1.0.0-0.rc4.1
+- Update to 1.0.0-rc4.
+- Requires ocaml-findlib (RHBZ#725415).
+- 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
+- Include a new manpage in section 3.
+
 * Wed Mar 30 2011 Richard W.M. Jones <rjones at redhat.com> - 0.2.5-0.rc9.1
 - Update to 0.2.5-rc9.
 - Ignore a bunch more false dependencies.
diff --git a/sources b/sources
index aeec95c..0bc77e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-600e731cecaaba1ab37fe1da84ab6c26  coccinelle-0.2.5-rc9.tgz
+d9a29443f4305fdf511eb0ba0cf532b8  coccinelle-1.0.0-rc4.tgz