Accepting request 548610 from devel:tools

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/548610
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coccinelle?expand=0&rev=22

coccinelle-1.0.4.patch

@@ -1,15 +0,0 @@
----
- setup/cocci.m4 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/setup/cocci.m4
-+++ b/setup/cocci.m4
-@@ -285,7 +285,7 @@ AC_DEFUN([AC_COCCI_TOOL],
-     AC_SUBST([$1], [no])
-   ],
-   [dnl  find the tool
--    AC_COCCI_FINDTOOL([$1],[[$]$1])
-+    AC_COCCI_FINDTOOL([$1],[$2])
-   ])
- 
-   AS_IF([test -z "[$]$1" -o "x[$]$1" = xno],

coccinelle-1.0.4.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f823813a2ea299c0f6c01d8419b83c4dc6617116d32ba99d726443a1c22b06d
-size 2484218

coccinelle-1.0.6.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8452ed265c209dae99cbb33b67bc7912e72f8bca1e24f33f1a88ba3d7985e909
+size 6684278

coccinelle.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Tue Nov 28 10:25:02 UTC 2017 - jengelh@inai.de
+
+- Add kill-env.diff
+
+-------------------------------------------------------------------
+Tue Nov 28 01:14:03 UTC 2017 - aavindraa@gmail.com
+
+- use %make_install macro
+- remove useless directory creation
+
+-------------------------------------------------------------------
+Sun Nov 26 22:45:58 UTC 2017 - jengelh@inai.de
+
+- Update to new upstream release 1.0.6
+  * Allow \ in #define in semantic patch rules, to allow body
+    with multiple lines, potentially including changes. As a side
+    effect, \ is also allowed in when specifications, again to
+    allow patterns to stretch over multiple lines.
+  * Add identifier list metavariables for #define parameter lists
+  * Support for Python 3. Pycaml has been patched.
+- Remove coccinelle-1.0.4.patch (merged)
+
 -------------------------------------------------------------------
 Mon May 30 08:22:09 UTC 2016 - olaf@aepfle.de
 

coccinelle.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package coccinelle
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           coccinelle
-Version:        1.0.4
+Version:        1.0.6
 Release:        0
 Summary:        Semantic patch utility
 License:        GPL-2.0
@@ -26,7 +26,7 @@ Url:            http://coccinelle.lip6.fr/
 
 #Git-Clone:	git://github.com/coccinelle/coccinelle
 Source:         http://coccinelle.lip6.fr/distrib/%name-%version.tgz
-Patch0:         coccinelle-1.0.4.patch
+Patch1:         kill-env.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -47,40 +47,39 @@ Requires:       python-base
 %description
 Coccinelle is a program matching and transformation engine which
 provides the language SmPL (Semantic Patch Language) for specifying
-desired matches and transformations in C code. Coccinelle was
-initially targeted towards performing collateral evolutions in Linux.
-Such evolutions comprise the changes that are needed in client code
-in response to evolutions in library APIs, and may include
-modifications such as renaming a function, adding a function argument
-whose value is somehow context-dependent, and reorganizing a data
-structure. Beyond collateral evolutions, Coccinelle is successfully
-used (by us and others) for finding and fixing bugs in systems code.
+desired matches and transformations in C code. [It does not recognize
+C++.]
+
+Coccinelle performs collateral evolutions in software. Such
+evolutions comprise the changes that are needed in client code in
+response to evolutions in library APIs, and may include modifications
+such as renaming a function, adding a function argument whose value
+is somehow context-dependent, and reorganizing a data structure.
+Beyond collateral evolutions, Coccinelle is used for finding and
+fixing bugs in systems code.
 
 %prep
-%setup -qn %name-%version
-%patch0 -p1
+%setup -q
+%patch -P 1 -p1
 
 %build
 autoreconf -fi
 %configure
-make
+make %{?_smp_mflags}
 
 %install
-# "because it is simply not possible to strip ocaml binaries that are built 
+# "because it is simply not possible to strip ocaml binaries that are built
 # with the -custom option."
 export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
-%define __debug_install_post %{nil}
+%define __debug_install_post %nil
 : >debugfiles.list
 : >debugsources.list
 
-b="%buildroot"
-make install DESTDIR="$b"
+%make_install
 # Remove coccilib, don't have the deps
-rm -Rf "$b/%_libdir/%name"/{commons,globals,ocaml,parsing_c} \
-	"$b/%_mandir/man3"/Coccilib*;
-
-mkdir -p "$b/%_libdir";
+rm -Rf "%buildroot/%_libdir/%name"/{commons,globals,ocaml,parsing_c} \
+	"%buildroot/%_mandir/man3"/Coccilib*
 %fdupes %buildroot/%_prefix
 
 %files
@@ -88,7 +87,7 @@ mkdir -p "$b/%_libdir";
 %doc authors.txt bugs.txt changes.txt copyright.txt credits.txt
 %doc license.txt readme.txt
 %_mandir/man?/*
-%_bindir/spatch*
+%_bindir/sp*
 %_bindir/pycocci
 %_libdir/%name
 

kill-env.diff

@@ -0,0 +1,19 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2017-11-28 11:24:59.025640109 +0100
+
+Don't choose arbitrary python interpreters from $PATH.
+(It also misleads the rpm autodep scanner.)
+---
+ tools/pycocci |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: coccinelle-1.0.6/tools/pycocci
+===================================================================
+--- coccinelle-1.0.6.orig/tools/pycocci
++++ coccinelle-1.0.6/tools/pycocci
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright (c) 2014 Luis R. Rodriguez  <mcgrof@suse.com>
+ # Copyright (c) 2013 Johannes Berg <johannes@sipsolutions.net>