[coccinelle] New upstream version 1.0.0-rc18.

Richard W.M. Jones rjones at fedoraproject.org
Thu Sep 19 14:45:11 UTC 2013


commit 4823b455efe3c029e8aa26c49917e67af7db71ce
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Sep 19 15:44:59 2013 +0100

    New upstream version 1.0.0-rc18.
    
    - OCaml 4.01.0 rebuild.
    - Enable debuginfo.
    - Remove strip & prelink hacks.
    - Enable test.

 .gitignore      |    1 +
 coccinelle.spec |   28 +++++++++++-----------------
 sources         |    2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 013ef7a..a0fdd80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ coccinelle-0.2.3rc6.tgz
 /coccinelle-1.0.0-rc12.tgz
 /coccinelle-1.0.0-rc14.tgz
 /coccinelle-1.0.0-rc17.tgz
+/coccinelle-1.0.0-rc18.tgz
diff --git a/coccinelle.spec b/coccinelle.spec
index f174386..610eee1 100644
--- a/coccinelle.spec
+++ b/coccinelle.spec
@@ -1,14 +1,8 @@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
-
-%if !%opt
-# Prevent RPM from stripping bytecode /usr/bin/spatch.
-%define __strip /bin/true
-%endif
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           coccinelle
 Version:        1.0.0
-Release:        0.rc17.2%{?dist}.1
+Release:        0.rc18.1%{?dist}
 Summary:        Semantic patching for Linux (spatch)
 
 Group:          Development/Libraries
@@ -17,7 +11,7 @@ License:        GPLv2
 ExcludeArch:    sparc64 s390 s390x ppc64
 
 URL:            http://coccinelle.lip6.fr/
-Source0:        http://coccinelle.lip6.fr/distrib/%{name}-%{version}-rc17.tgz
+Source0:        http://coccinelle.lip6.fr/distrib/%{name}-%{version}-rc18.tgz
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -66,7 +60,7 @@ The %{name}-examples package contains examples for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc17
+%setup -q -n %{name}-%{version}-rc18
 
 # Remove .cvsignore files.
 find -name .cvsignore -delete
@@ -103,11 +97,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm $RPM_BUILD_ROOT%{_bindir}/spatch
 mv $RPM_BUILD_ROOT%{_bindir}/spatch.opt $RPM_BUILD_ROOT%{_bindir}/spatch
 strip $RPM_BUILD_ROOT%{_datadir}/%{name}/spatch.opt
-%else
-# Else prevent prelink from buggering about with the bytecode binary.
-mkdir -p $RPM_BUILD_ROOT/etc/prelink.conf.d
-echo '-b %{_bindir}/spatch' \
-  > $RPM_BUILD_ROOT/etc/prelink.conf.d/%{name}.conf
 %endif
 
 # Move Python libraries to python lib directory.
@@ -128,12 +117,10 @@ export LD_LIBRARY_PATH=.
 # Run --help to check the command works in general.
 $RPM_BUILD_ROOT%{_bindir}/spatch --help
 
-%if 0
 # Test fails with "Fatal error: Out of memory".
 # Seems to be a bug in coccinelle, so it's unlikely that this
 # package really functions properly.
 $RPM_BUILD_ROOT%{_bindir}/spatch -sp_file demos/simple.cocci demos/simple.c
-%endif
 
 
 %files
@@ -158,6 +145,13 @@ $RPM_BUILD_ROOT%{_bindir}/spatch -sp_file demos/simple.cocci demos/simple.c
 
 
 %changelog
+* Thu Sep 19 2013 Richard W.M. Jones <rjones at redhat.com> - 1.0.0-0.rc18.1
+- New upstream version 1.0.0-rc18.
+- OCaml 4.01.0 rebuild.
+- Enable debuginfo.
+- Remove strip & prelink hacks.
+- Enable test.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.rc17.2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 773876f..872bbc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35aa5941c146424fba9e6bd24c20107e  coccinelle-1.0.0-rc17.tgz
+f9b52a0c467573c400cfa8b810985521  coccinelle-1.0.0-rc18.tgz


More information about the scm-commits mailing list