From bdae1e7d87839fb51041a5cd12aa3f54a1c682ee9df8e70e509f972b05264e77 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 25 Jun 2011 20:25:31 +0000 Subject: [PATCH 1/4] 1.0.0-rc3 OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=11 --- cocci-cast.diff | 21 --------------------- cocci-pythondetect.diff | 17 ----------------- coccinelle-0.2.5-rc2.tar.xz | 3 --- coccinelle-1.0.0-rc3.tar.xz | 3 +++ coccinelle.changes | 11 +++++++++++ coccinelle.spec | 35 ++++------------------------------- 6 files changed, 18 insertions(+), 72 deletions(-) delete mode 100644 cocci-cast.diff delete mode 100644 cocci-pythondetect.diff delete mode 100644 coccinelle-0.2.5-rc2.tar.xz create mode 100644 coccinelle-1.0.0-rc3.tar.xz diff --git a/cocci-cast.diff b/cocci-cast.diff deleted file mode 100644 index 8452702..0000000 --- a/cocci-cast.diff +++ /dev/null @@ -1,21 +0,0 @@ -Work around compiler warning - -pycaml_ml.c: In function 'pymodule_initmodule': -pycaml_ml.c:1441: warning: assignment makes pointer from integer without a cast ---- - pycaml/pycaml_ml.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: coccinelle-0.2.2/pycaml/pycaml_ml.c -=================================================================== ---- coccinelle-0.2.2.orig/pycaml/pycaml_ml.c -+++ coccinelle-0.2.2/pycaml/pycaml_ml.c -@@ -1438,7 +1438,7 @@ value pymodule_initmodule( value name, v - for( i = 0; i < Wosize_val(funclist); i++ ) { - item = Field(funclist,i); - methods[i].ml_name = String_val(Field(item,0)); -- methods[i].ml_meth = pywrap_closure(Field(item,1)); -+ methods[i].ml_meth = (void *)(long)pywrap_closure(Field(item,1)); - methods[i].ml_flags = Int_val(Field(item,2)); - methods[i].ml_doc = String_val(Field(item,3)); - } diff --git a/cocci-pythondetect.diff b/cocci-pythondetect.diff deleted file mode 100644 index 0401919..0000000 --- a/cocci-pythondetect.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: coccinelle-0.2.5-rc2/configure -=================================================================== ---- coccinelle-0.2.5-rc2.orig/configure -+++ coccinelle-0.2.5-rc2/configure -@@ -198,7 +198,7 @@ We need 3.XX", - if($python) { - if(check_config( - "python --version 2>&1 |", -- "Python 2\.[567]\..*", -+ qr/Python 2\.[567]\b/, - "python is present", - "python is missing or is not a good version." - )) diff --git a/coccinelle-0.2.5-rc2.tar.xz b/coccinelle-0.2.5-rc2.tar.xz deleted file mode 100644 index 0fdb4c6..0000000 --- a/coccinelle-0.2.5-rc2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d036b24cac67199126e5f25cd8f9466351d09cf6620926a32af16495f0c7905 -size 1538224 diff --git a/coccinelle-1.0.0-rc3.tar.xz b/coccinelle-1.0.0-rc3.tar.xz new file mode 100644 index 0000000..a9aa510 --- /dev/null +++ b/coccinelle-1.0.0-rc3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93e1fa02a3c0e02ab7e6b8a5e7a349c7ae5b1cde80e31456af96cfc24cda2080 +size 1555340 diff --git a/coccinelle.changes b/coccinelle.changes index 28c5362..5ad6214 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Jun 25 20:23:37 UTC 2011 - jengelh@medozas.de + +- Update to new upstream release 1.0.0~rc3 +* Addition of initializer list metavariables. +* Allow multiple position variables per token +* ++ can now be associated with - code +* Allow /* */ comments as smpl comments, not only as + code +* Add support for && (label addresses) +* local idexpression metavariable no longer matches static local x + ------------------------------------------------------------------- Thu Jan 20 13:41:16 UTC 2011 - jengelh@medozas.de diff --git a/coccinelle.spec b/coccinelle.spec index 1ba67b0..1755f70 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -1,35 +1,14 @@ -# -# spec file for package coccinelle -# -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - - Name: coccinelle -Version: 0.2.5 -Release: 1 +Version: 1.0.0 +Release: 0 Summary: Semantic patch utility License: GPL2 Group: Productivity/Text/Utilities -Url: http://coccinelle.lip6.fr/ -%define rversion %version-rc2 +URL: http://coccinelle.lip6.fr/ +%define rversion %version-rc3 Source: %name-%rversion.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ncurses-devel ocaml python-devel xz -Patch1: cocci-cast.diff -Patch2: cocci-pythondetect.diff %description Coccinelle is a program matching and transformation engine which @@ -45,7 +24,6 @@ used (by us and others) for finding and fixing bugs in systems code. %prep %setup -qn %name-%rversion -%patch -P 1 -P 2 -p1 %build # not autotools configure, don't use macro @@ -62,13 +40,8 @@ export NO_DEBUGINFO_STRIP_DEBUG=true >debugsources.list b="%buildroot" -rm -Rf "$b" -mkdir "$b" make install DESTDIR="$b" MANDIR="%_mandir" LIBDIR="%_libdir" -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %doc authors.txt bugs.txt changes.txt copyright.txt credits.txt From 518252bfa799fcf6923c4bdbaba4cd292301191d01abbdbc407f03bec1f94bca Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 10 Jul 2011 19:11:12 +0000 Subject: [PATCH 2/4] 1.0.0~rc4 OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=12 --- coccinelle-1.0.0-rc3.tar.xz | 3 --- coccinelle-1.0.0-rc4.tar.xz | 3 +++ coccinelle.changes | 4 ++-- coccinelle.spec | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 coccinelle-1.0.0-rc3.tar.xz create mode 100644 coccinelle-1.0.0-rc4.tar.xz diff --git a/coccinelle-1.0.0-rc3.tar.xz b/coccinelle-1.0.0-rc3.tar.xz deleted file mode 100644 index a9aa510..0000000 --- a/coccinelle-1.0.0-rc3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93e1fa02a3c0e02ab7e6b8a5e7a349c7ae5b1cde80e31456af96cfc24cda2080 -size 1555340 diff --git a/coccinelle-1.0.0-rc4.tar.xz b/coccinelle-1.0.0-rc4.tar.xz new file mode 100644 index 0000000..0505402 --- /dev/null +++ b/coccinelle-1.0.0-rc4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4711bf4c52edcbd18a1511ddd81dc66c3bb7fe1c51721cb5ee26a16ddc2f8a5 +size 1558276 diff --git a/coccinelle.changes b/coccinelle.changes index 5ad6214..59ec8bf 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Sat Jun 25 20:23:37 UTC 2011 - jengelh@medozas.de +Sun Jul 10 19:08:55 UTC 2011 - jengelh@medozas.de -- Update to new upstream release 1.0.0~rc3 +- Update to new upstream release 1.0.0 * Addition of initializer list metavariables. * Allow multiple position variables per token * ++ can now be associated with - code diff --git a/coccinelle.spec b/coccinelle.spec index 1755f70..225fbb5 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -5,7 +5,7 @@ Summary: Semantic patch utility License: GPL2 Group: Productivity/Text/Utilities URL: http://coccinelle.lip6.fr/ -%define rversion %version-rc3 +%define rversion %version-rc4 Source: %name-%rversion.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ncurses-devel ocaml python-devel xz From f6e8b5fa827232ea605e35ac47fc34dec78189ad531816477c0098f8441e6370 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 20 Sep 2011 15:13:51 +0000 Subject: [PATCH 3/4] Nuke unsatisfiable dependencies on ocaml runtime OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=13 --- coccinelle-1.0.0-rc4.tar.xz | 3 --- coccinelle-1.0.0-rc7.tar.xz | 3 +++ coccinelle.changes | 1 + coccinelle.spec | 5 ++++- 4 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 coccinelle-1.0.0-rc4.tar.xz create mode 100644 coccinelle-1.0.0-rc7.tar.xz diff --git a/coccinelle-1.0.0-rc4.tar.xz b/coccinelle-1.0.0-rc4.tar.xz deleted file mode 100644 index 0505402..0000000 --- a/coccinelle-1.0.0-rc4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4711bf4c52edcbd18a1511ddd81dc66c3bb7fe1c51721cb5ee26a16ddc2f8a5 -size 1558276 diff --git a/coccinelle-1.0.0-rc7.tar.xz b/coccinelle-1.0.0-rc7.tar.xz new file mode 100644 index 0000000..2c25920 --- /dev/null +++ b/coccinelle-1.0.0-rc7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1abea24aa173836930d119102f572d52cfc086897032a91f4988def11379edf7 +size 1574892 diff --git a/coccinelle.changes b/coccinelle.changes index 59ec8bf..4ccb4e2 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -8,6 +8,7 @@ Sun Jul 10 19:08:55 UTC 2011 - jengelh@medozas.de * Allow /* */ comments as smpl comments, not only as + code * Add support for && (label addresses) * local idexpression metavariable no longer matches static local x +* see http://coccinelle.lip6.fr/distrib/changes.html for details ------------------------------------------------------------------- Thu Jan 20 13:41:16 UTC 2011 - jengelh@medozas.de diff --git a/coccinelle.spec b/coccinelle.spec index 225fbb5..92afe92 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -5,7 +5,7 @@ Summary: Semantic patch utility License: GPL2 Group: Productivity/Text/Utilities URL: http://coccinelle.lip6.fr/ -%define rversion %version-rc4 +%define rversion %version-rc7 Source: %name-%rversion.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ncurses-devel ocaml python-devel xz @@ -41,6 +41,9 @@ export NO_DEBUGINFO_STRIP_DEBUG=true b="%buildroot" make install DESTDIR="$b" MANDIR="%_mandir" LIBDIR="%_libdir" +# Remove coccilib, don't have the deps +rm -Rf "$b/%_datadir/%name"/{commons,globals,ocaml,parsing_c} \ + "$b/%_mandir/man3"/Coccilib*; %files %defattr(-,root,root) From 4cba30c5e14d03240e97330d5b34d8867190700d4979975858b82f8ba80238ed Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 21 Sep 2011 10:53:31 +0000 Subject: [PATCH 4/4] Run format-spec-file to apply same changes as have been done in Factory regarding comments OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=14 --- coccinelle.spec | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/coccinelle.spec b/coccinelle.spec index 92afe92..42bab16 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -1,3 +1,22 @@ +# +# spec file for package coccinelle +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + + Name: coccinelle Version: 1.0.0 Release: 0