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-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 28c5362..4ccb4e2 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Jul 10 19:08:55 UTC 2011 - jengelh@medozas.de + +- 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 +* 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 1ba67b0..42bab16 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -18,18 +18,16 @@ 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-rc7 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 +43,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,12 +59,10 @@ 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} +# 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)