From 02c09c593cb7eef80de20b9359139b554045f5ff653a75f890d629ebdbf55658 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 26 Oct 2019 11:34:47 +0000 Subject: [PATCH 1/7] Accepting request 742607 from devel:languages:ocaml - Update to new upstream release 1.0.8 See included changes.txt for details - Remove usage of camlp4 - Remove pkg-config. It is not required, but pulled in anyway by other packages - Disable parallel build due to internal copy of stdcompat OBS-URL: https://build.opensuse.org/request/show/742607 OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=67 --- coccinelle-1.0.8.tar.gz | 3 +++ coccinelle.changes | 10 ++++++++++ coccinelle.spec | 6 ++---- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 coccinelle-1.0.8.tar.gz diff --git a/coccinelle-1.0.8.tar.gz b/coccinelle-1.0.8.tar.gz new file mode 100644 index 0000000..512d7ae --- /dev/null +++ b/coccinelle-1.0.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f994bf98bc88c333ac7a54a03d4fa1826122eec7016a1f22c6b2ef2a6a4347f +size 2670961 diff --git a/coccinelle.changes b/coccinelle.changes index 2b5ade4..7da69ff 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 24 13:10:02 UTC 2019 - olaf@aepfle.de + +- Update to new upstream release 1.0.8 + See included changes.txt for details +- Remove usage of camlp4 +- Remove pkg-config. It is not required, but pulled in anyway + by other packages +- Disable parallel build due to internal copy of stdcompat + ------------------------------------------------------------------- Thu Aug 22 14:04:45 UTC 2019 - Jan Engelhardt diff --git a/coccinelle.spec b/coccinelle.spec index a7a2138..fc3cd1a 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -17,7 +17,7 @@ Name: coccinelle -Version: 1.0.7 +Version: 1.0.8 Release: 0 Summary: Semantic patch utility License: GPL-2.0-only @@ -38,8 +38,6 @@ BuildRequires: ocaml-ocamlbuild BuildRequires: ocaml-ocamldoc >= 3.11 BuildRequires: ocaml-parmap-devel BuildRequires: ocaml-pcre-devel -BuildRequires: pkgconfig -BuildRequires: ocamlfind(camlp4) BuildRequires: pkgconfig(python) Requires: python-base @@ -64,7 +62,7 @@ rm -fv tools/spgen/source/spgen{,.opt} %build autoreconf -fi %configure -make %{?_smp_mflags} +make #{?_smp_mflags} %install # "because it is simply not possible to strip ocaml binaries that are built From cab326378162e06ea5c129c46ff2efc2bd3a97dd811753e0cbc1b259c46c5b9a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 12 Dec 2019 10:31:01 +0000 Subject: [PATCH 2/7] Accepting request 755993 from home:wanghaisu:branches:devel:tools Remove the useless outdate tarball. OBS-URL: https://build.opensuse.org/request/show/755993 OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=68 --- coccinelle-1.0.7.tar.gz | 3 --- coccinelle.spec | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 coccinelle-1.0.7.tar.gz diff --git a/coccinelle-1.0.7.tar.gz b/coccinelle-1.0.7.tar.gz deleted file mode 100644 index 633dea4..0000000 --- a/coccinelle-1.0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:475e2bed5486023d19d9e0dec5e109b04b872a9917b62faf83ce3521676f728b -size 6607407 diff --git a/coccinelle.spec b/coccinelle.spec index fc3cd1a..24fcb4f 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -1,7 +1,7 @@ # # spec file for package coccinelle # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 87f2a892e9b25b4bd7e6c068f1d001c3887cc8b0d099094d46b413d1046cd764 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 7 Jan 2020 08:08:51 +0000 Subject: [PATCH 3/7] Accepting request 761345 from home:wanghaisu:branches:devel:tools bsc#1160194, fix the wrong python path. OBS-URL: https://build.opensuse.org/request/show/761345 OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=69 --- coccinelle.changes | 5 +++++ coccinelle.spec | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/coccinelle.changes b/coccinelle.changes index 7da69ff..18ea7d4 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 7 07:45:29 UTC 2020 - nick wang + +- bsc#1160194, change the python library to site-packages hierarchy. + ------------------------------------------------------------------- Thu Oct 24 13:10:02 UTC 2019 - olaf@aepfle.de diff --git a/coccinelle.spec b/coccinelle.spec index 24fcb4f..fad6219 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -1,7 +1,7 @@ # # spec file for package coccinelle # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -80,10 +80,16 @@ rm -Rf "%buildroot/%_libdir/%name"/{commons,globals,ocaml,parsing_c} \ "%buildroot/%_mandir/man3"/Coccilib* %fdupes %buildroot/%_prefix +# Python library have been named after directories in the site-packages hierarchy +mkdir -p %{buildroot}%{python_sitelib} +mv %{buildroot}%{_libdir}/%{name}/python/coccilib %{buildroot}%{python_sitelib} +%fdupes %{buildroot}%{python_sitelib}/coccilib + %files %doc authors.txt bugs.txt changes.txt copyright.txt credits.txt %license license.txt %doc readme.txt +%{python_sitelib}/coccilib %_mandir/man?/* %_bindir/sp* %_libdir/%name From 720ba8030d4c81a0ffbf8f73f789dc84d7ddfc1aad1c36c6723938d5001a598a Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 9 Jan 2020 14:05:35 +0000 Subject: [PATCH 4/7] trim URL, gives 404 OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=70 --- coccinelle.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coccinelle.spec b/coccinelle.spec index fad6219..b9b6a92 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -25,7 +25,7 @@ Group: Productivity/Text/Utilities URL: http://coccinelle.lip6.fr/ #Git-Clone: git://github.com/coccinelle/coccinelle -Source: http://coccinelle.lip6.fr/distrib/%name-%version.tar.gz +Source0: %name-%version.tar.gz Patch1: kill-env.diff BuildRequires: autoconf BuildRequires: automake From b775ba7e48e204b36e82909f031ec5ff70f6ef7866f5fc48157fd4b94b45272f Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 9 Jan 2020 14:16:51 +0000 Subject: [PATCH 5/7] remove stale, and incorrectly placed, cmd OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=71 --- coccinelle.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/coccinelle.spec b/coccinelle.spec index b9b6a92..fdf9e6b 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -57,7 +57,6 @@ fixing bugs in systems code. %prep %autosetup -p1 -rm -fv tools/spgen/source/spgen{,.opt} %build autoreconf -fi From 52dc786c1ec9a09c627bfa1a04ad686c38a0ec2f1f2d96ca13b83d8cd5a3385c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 10 Jan 2020 10:35:58 +0000 Subject: [PATCH 6/7] - Update to new source URL. OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=72 --- coccinelle.changes | 9 +++++++-- coccinelle.spec | 13 +++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/coccinelle.changes b/coccinelle.changes index 18ea7d4..281f892 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 10 10:35:20 UTC 2020 - Jan Engelhardt + +- Update to new source URL. + ------------------------------------------------------------------- Tue Jan 7 07:45:29 UTC 2020 - nick wang -- bsc#1160194, change the python library to site-packages hierarchy. +- bsc#1160194, change the python library to site-packages hierarchy. ------------------------------------------------------------------- Thu Oct 24 13:10:02 UTC 2019 - olaf@aepfle.de @@ -28,7 +33,7 @@ Thu Aug 22 14:04:45 UTC 2019 - Jan Engelhardt * Allow script finalizers for parallel computation. See tests/countcalls.cocci and tests/countcalls_python.cocci * Allow disjunctions on a wider range of syntactic - constructions (function definitions, variable declarations, + constructions (function definitions, variable declarations …). ------------------------------------------------------------------- diff --git a/coccinelle.spec b/coccinelle.spec index fdf9e6b..aff9540 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -23,9 +23,9 @@ Summary: Semantic patch utility License: GPL-2.0-only Group: Productivity/Text/Utilities URL: http://coccinelle.lip6.fr/ -#Git-Clone: git://github.com/coccinelle/coccinelle -Source0: %name-%version.tar.gz +#Git-Clone: https://github.com/coccinelle/coccinelle +Source0: https://github.com/coccinelle/coccinelle/archive/%version.tar.gz#/%name-%version.tar.gz Patch1: kill-env.diff BuildRequires: autoconf BuildRequires: automake @@ -61,7 +61,8 @@ fixing bugs in systems code. %build autoreconf -fi %configure -make #{?_smp_mflags} +# internal copy of stdcompat +make -j1 %install # "because it is simply not possible to strip ocaml binaries that are built @@ -80,9 +81,9 @@ rm -Rf "%buildroot/%_libdir/%name"/{commons,globals,ocaml,parsing_c} \ %fdupes %buildroot/%_prefix # Python library have been named after directories in the site-packages hierarchy -mkdir -p %{buildroot}%{python_sitelib} -mv %{buildroot}%{_libdir}/%{name}/python/coccilib %{buildroot}%{python_sitelib} -%fdupes %{buildroot}%{python_sitelib}/coccilib +mkdir -p "%buildroot/%python_sitelib" +mv "%buildroot/%_libdir/%name/python/coccilib" "%buildroot/%python_sitelib" +%fdupes %buildroot/%python_sitelib/coccilib %files %doc authors.txt bugs.txt changes.txt copyright.txt credits.txt From a5f5543d971059623950f994e34287505eab94ce87513e9fcd9ed3e499044c08 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 15 Jan 2020 17:11:44 +0000 Subject: [PATCH 7/7] - Use _service file to trim the bundles directory OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=73 --- _service | 21 +++++++++++++++++++++ coccinelle-1.0.8.tar.gz | 3 --- coccinelle-1.0.8.tar.xz | 3 +++ coccinelle.changes | 5 +++++ coccinelle.spec | 4 +--- 5 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 _service delete mode 100644 coccinelle-1.0.8.tar.gz create mode 100644 coccinelle-1.0.8.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..1206abc --- /dev/null +++ b/_service @@ -0,0 +1,21 @@ + + + https://github.com/coccinelle/coccinelle.git + git + @PARENT_TAG@ + d678c34afc0cfb479ad34f2225c57b1b8d3ebeae + coccinelle +bundles/menhirLib +bundles/parmap +bundles/pcre + + + + *.tar + xz + + + diff --git a/coccinelle-1.0.8.tar.gz b/coccinelle-1.0.8.tar.gz deleted file mode 100644 index 512d7ae..0000000 --- a/coccinelle-1.0.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f994bf98bc88c333ac7a54a03d4fa1826122eec7016a1f22c6b2ef2a6a4347f -size 2670961 diff --git a/coccinelle-1.0.8.tar.xz b/coccinelle-1.0.8.tar.xz new file mode 100644 index 0000000..e9da145 --- /dev/null +++ b/coccinelle-1.0.8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78c8e64daf3b9e47be8760c8346fa1bf91b66960680c091625c7dd228a0f44f1 +size 1319948 diff --git a/coccinelle.changes b/coccinelle.changes index 281f892..a29f4ef 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 15 17:10:38 UTC 2020 - olaf@aepfle.de + +- Use _service file to trim the bundles directory + ------------------------------------------------------------------- Fri Jan 10 10:35:20 UTC 2020 - Jan Engelhardt diff --git a/coccinelle.spec b/coccinelle.spec index aff9540..b299157 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -23,9 +23,7 @@ Summary: Semantic patch utility License: GPL-2.0-only Group: Productivity/Text/Utilities URL: http://coccinelle.lip6.fr/ - -#Git-Clone: https://github.com/coccinelle/coccinelle -Source0: https://github.com/coccinelle/coccinelle/archive/%version.tar.gz#/%name-%version.tar.gz +Source0: %name-%version.tar.xz Patch1: kill-env.diff BuildRequires: autoconf BuildRequires: automake