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.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-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 2b5ade4..a29f4ef 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +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 + +- 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. + +------------------------------------------------------------------- +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 @@ -13,7 +38,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 a7a2138..b299157 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) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: coccinelle -Version: 1.0.7 +Version: 1.0.8 Release: 0 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 - -Source: http://coccinelle.lip6.fr/distrib/%name-%version.tar.gz +Source0: %name-%version.tar.xz Patch1: kill-env.diff BuildRequires: autoconf BuildRequires: automake @@ -38,8 +36,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 @@ -59,12 +55,12 @@ fixing bugs in systems code. %prep %autosetup -p1 -rm -fv tools/spgen/source/spgen{,.opt} %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 @@ -82,10 +78,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