From 96c088968daec8e4aa27ea51833bf5bf36fb12193eb0584ac7211e55c161b933 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 26 Nov 2017 22:48:19 +0000
Subject: [PATCH] coccinelle-1.0.6

OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=54
---
 coccinelle-1.0.4.patch | 15 ---------------
 coccinelle-1.0.4.tgz   |  3 ---
 coccinelle-1.0.6.tgz   |  3 +++
 coccinelle.changes     | 11 +++++++++++
 coccinelle.spec        | 14 ++++++--------
 5 files changed, 20 insertions(+), 26 deletions(-)
 delete mode 100644 coccinelle-1.0.4.patch
 delete mode 100644 coccinelle-1.0.4.tgz
 create mode 100644 coccinelle-1.0.6.tgz

diff --git a/coccinelle-1.0.4.patch b/coccinelle-1.0.4.patch
deleted file mode 100644
index 3c79b95..0000000
--- a/coccinelle-1.0.4.patch
+++ /dev/null
@@ -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],
diff --git a/coccinelle-1.0.4.tgz b/coccinelle-1.0.4.tgz
deleted file mode 100644
index b214f00..0000000
--- a/coccinelle-1.0.4.tgz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f823813a2ea299c0f6c01d8419b83c4dc6617116d32ba99d726443a1c22b06d
-size 2484218
diff --git a/coccinelle-1.0.6.tgz b/coccinelle-1.0.6.tgz
new file mode 100644
index 0000000..82167fb
--- /dev/null
+++ b/coccinelle-1.0.6.tgz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8452ed265c209dae99cbb33b67bc7912e72f8bca1e24f33f1a88ba3d7985e909
+size 6684278
diff --git a/coccinelle.changes b/coccinelle.changes
index e8b8fce..bb8de0c 100644
--- a/coccinelle.changes
+++ b/coccinelle.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+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.
+
 -------------------------------------------------------------------
 Mon May 30 08:22:09 UTC 2016 - olaf@aepfle.de
 
diff --git a/coccinelle.spec b/coccinelle.spec
index d8474b5..1557395 100644
--- a/coccinelle.spec
+++ b/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,6 @@ 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -58,7 +57,6 @@ used (by us and others) for finding and fixing bugs in systems code.
 
 %prep
 %setup -qn %name-%version
-%patch0 -p1
 
 %build
 autoreconf -fi
@@ -70,7 +68,7 @@ make
 # 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
 
@@ -78,9 +76,9 @@ b="%buildroot"
 make install DESTDIR="$b"
 # Remove coccilib, don't have the deps
 rm -Rf "$b/%_libdir/%name"/{commons,globals,ocaml,parsing_c} \
-	"$b/%_mandir/man3"/Coccilib*;
+	"$b/%_mandir/man3"/Coccilib*
 
-mkdir -p "$b/%_libdir";
+mkdir -p "$b/%_libdir"
 %fdupes %buildroot/%_prefix
 
 %files
@@ -88,7 +86,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