From e440213047c04933a0bcd10b4b4c806c345440c30faf3b321f8889527651a4e0 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Sep 2011 11:48:54 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=15 --- cocci-cast.diff | 21 +++++++++++++++++++++ cocci-pythondetect.diff | 17 +++++++++++++++++ coccinelle-0.2.5-rc2.tar.xz | 3 +++ 3 files changed, 41 insertions(+) create mode 100644 cocci-cast.diff create mode 100644 cocci-pythondetect.diff create mode 100644 coccinelle-0.2.5-rc2.tar.xz diff --git a/cocci-cast.diff b/cocci-cast.diff new file mode 100644 index 0000000..8452702 --- /dev/null +++ b/cocci-cast.diff @@ -0,0 +1,21 @@ +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 new file mode 100644 index 0000000..0401919 --- /dev/null +++ b/cocci-pythondetect.diff @@ -0,0 +1,17 @@ +--- + 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 new file mode 100644 index 0000000..0fdb4c6 --- /dev/null +++ b/coccinelle-0.2.5-rc2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d036b24cac67199126e5f25cd8f9466351d09cf6620926a32af16495f0c7905 +size 1538224 From 6107f8d229bf2a8f6ce7c273f8423c32c3553fbee6fdea71911f28e953a8c538 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Sep 2011 11:49:01 +0000 Subject: [PATCH 2/5] prepare_spec OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=17 --- coccinelle.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coccinelle.spec b/coccinelle.spec index 42bab16..4bcc276 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -23,7 +23,7 @@ Release: 0 Summary: Semantic patch utility License: GPL2 Group: Productivity/Text/Utilities -URL: http://coccinelle.lip6.fr/ +Url: http://coccinelle.lip6.fr/ %define rversion %version-rc7 Source: %name-%rversion.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build From 2d1ca8062f477d5245c8b9e0ff7f4a9fe060bc1b98a50c6274d207a2bf47f574 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Sep 2011 11:51:14 +0000 Subject: [PATCH 3/5] old stuff OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=18 --- coccinelle-0.2.5-rc2.tar.xz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 coccinelle-0.2.5-rc2.tar.xz 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 From eec1f4abf4794520e5e88518a738e337e865a50111aff0d3efecdb94bab253a8 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Sep 2011 11:51:27 +0000 Subject: [PATCH 4/5] old stuff OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=19 --- cocci-cast.diff | 21 --------------------- cocci-pythondetect.diff | 17 ----------------- 2 files changed, 38 deletions(-) delete mode 100644 cocci-cast.diff delete mode 100644 cocci-pythondetect.diff 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." - )) From b27bf2fc5cfbbb3a8ec5b9d37247a919715ec0d83d35768e2e222d3fff54fe5c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 13 Feb 2012 11:15:06 +0000 Subject: [PATCH 5/5] Accepting request 104314 from devel:openSUSE:Factory:patch-license patch license to follow spdx.org standard OBS-URL: https://build.opensuse.org/request/show/104314 OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=21 --- coccinelle.changes | 5 +++++ coccinelle.spec | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/coccinelle.changes b/coccinelle.changes index 4ccb4e2..5f40093 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 13 10:45:09 UTC 2012 - coolo@suse.com + +- patch license to follow spdx.org standard + ------------------------------------------------------------------- Sun Jul 10 19:08:55 UTC 2011 - jengelh@medozas.de diff --git a/coccinelle.spec b/coccinelle.spec index 4bcc276..22321e2 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -1,7 +1,7 @@ # # spec file for package coccinelle # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,18 +16,20 @@ # - Name: coccinelle Version: 1.0.0 Release: 0 Summary: Semantic patch utility -License: GPL2 +License: GPL-2.0 Group: Productivity/Text/Utilities 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 +BuildRequires: ncurses-devel +BuildRequires: ocaml +BuildRequires: python-devel +BuildRequires: xz %description Coccinelle is a program matching and transformation engine which