From a12bc842ea927df2c247789f9a1afdeea3b3bf8bf86ff3c5d1de133ac34113fb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 24 May 2016 14:32:02 +0000 Subject: [PATCH 1/3] Accepting request 397728 from home:olh:branches:devel:tools - Fix build with ocaml-4.03 Use ocaml-parmap and ocaml-menhir instead of old built-in copies Use ocaml-pcre OBS-URL: https://build.opensuse.org/request/show/397728 OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=50 --- coccinelle-1.0.4.patch | 15 +++++++++++++++ coccinelle.changes | 7 +++++++ coccinelle.spec | 15 +++++++++++---- 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 coccinelle-1.0.4.patch diff --git a/coccinelle-1.0.4.patch b/coccinelle-1.0.4.patch new file mode 100644 index 0000000..3c79b95 --- /dev/null +++ b/coccinelle-1.0.4.patch @@ -0,0 +1,15 @@ +--- + 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.changes b/coccinelle.changes index d402e73..277de2e 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 24 14:20:12 UTC 2016 - olaf@aepfle.de + +- Fix build with ocaml-4.03 + Use ocaml-parmap and ocaml-menhir instead of old built-in copies + Use ocaml-pcre + ------------------------------------------------------------------- Tue Dec 15 00:00:00 CET 2015 - dsterba@suse.cz diff --git a/coccinelle.spec b/coccinelle.spec index 4eaefdc..5d91eeb 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -1,7 +1,7 @@ # # spec file for package coccinelle # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -26,16 +26,21 @@ 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 BuildRequires: fdupes BuildRequires: ncurses-devel BuildRequires: ocaml >= 3.11 BuildRequires: ocaml-camlp4-devel >= 3.11 BuildRequires: ocaml-findlib +BuildRequires: ocaml-menhir-devel +BuildRequires: ocaml-ocamlbuild BuildRequires: ocaml-ocamldoc >= 3.11 +BuildRequires: ocaml-parmap-devel +BuildRequires: ocaml-pcre-devel BuildRequires: pkg-config -# Fails to link with PCRE -#BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(python) Requires: python-base @@ -53,10 +58,12 @@ used (by us and others) for finding and fixing bugs in systems code. %prep %setup -qn %name-%version +%patch0 -p1 %build +autoreconf -fi %configure -make %{?_smp_mflags} +make %install # "because it is simply not possible to strip ocaml binaries that are built From c9dec2bb12b317a844fe71ec8e9bf956bcdfb701021d57b74d249aedd8025cd7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 30 May 2016 08:53:38 +0000 Subject: [PATCH 2/3] Accepting request 398866 from home:olh:branches:devel:tools - Use ocamlfind(camlp4) to refer to camlp4 OBS-URL: https://build.opensuse.org/request/show/398866 OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=51 --- coccinelle.changes | 5 +++++ coccinelle.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/coccinelle.changes b/coccinelle.changes index 277de2e..89c8915 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 30 08:22:09 UTC 2016 - olaf@aepfle.de + +- Use ocamlfind(camlp4) to refer to camlp4 + ------------------------------------------------------------------- Tue May 24 14:20:12 UTC 2016 - olaf@aepfle.de diff --git a/coccinelle.spec b/coccinelle.spec index 5d91eeb..d8474b5 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -33,7 +33,6 @@ BuildRequires: automake BuildRequires: fdupes BuildRequires: ncurses-devel BuildRequires: ocaml >= 3.11 -BuildRequires: ocaml-camlp4-devel >= 3.11 BuildRequires: ocaml-findlib BuildRequires: ocaml-menhir-devel BuildRequires: ocaml-ocamlbuild @@ -41,6 +40,7 @@ BuildRequires: ocaml-ocamldoc >= 3.11 BuildRequires: ocaml-parmap-devel BuildRequires: ocaml-pcre-devel BuildRequires: pkg-config +BuildRequires: ocamlfind(camlp4) BuildRequires: pkgconfig(python) Requires: python-base From d43bc1e6a9259731c5dcf3f9ffdc391104686f934891ef1af95d5e4357087735 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 26 Jul 2016 10:52:54 +0000 Subject: [PATCH 3/3] from sr 398869 OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=52 --- coccinelle.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/coccinelle.changes b/coccinelle.changes index 89c8915..e8b8fce 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -2,6 +2,7 @@ Mon May 30 08:22:09 UTC 2016 - olaf@aepfle.de - Use ocamlfind(camlp4) to refer to camlp4 +- Add coccinelle-1.0.4.patch ------------------------------------------------------------------- Tue May 24 14:20:12 UTC 2016 - olaf@aepfle.de