diff --git a/coccinelle-1.0.0-rc15.tar.xz b/coccinelle-1.0.0-rc15.tar.xz new file mode 100644 index 0000000..7f72251 --- /dev/null +++ b/coccinelle-1.0.0-rc15.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64d27fc4e6bc81d2a2485e82fe8e6bf9cddbd62a17029de4a27b774e1e8234c1 +size 2557896 diff --git a/coccinelle-1.0.0-rc7.tar.xz b/coccinelle-1.0.0-rc7.tar.xz deleted file mode 100644 index 2c25920..0000000 --- a/coccinelle-1.0.0-rc7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1abea24aa173836930d119102f572d52cfc086897032a91f4988def11379edf7 -size 1574892 diff --git a/coccinelle.changes b/coccinelle.changes index 73056bc..2c77a2c 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 3 16:18:10 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 1.0.0~rc15 +* See http://coccinelle.lip6.fr/distrib/changes.html for + the (quite large) set of new features and bugfixes + ------------------------------------------------------------------- Thu Sep 6 01:17:08 UTC 2012 - jengelh@inai.de diff --git a/coccinelle.spec b/coccinelle.spec index 929c626..0511dc2 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -23,11 +23,13 @@ Summary: Semantic patch utility License: GPL-2.0 Group: Productivity/Text/Utilities Url: http://coccinelle.lip6.fr/ -%define rversion %version-rc7 +%define rversion %version-rc15 Source: %name-%rversion.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ncurses-devel -BuildRequires: ocaml +BuildRequires: ocaml >= 3.11 +BuildRequires: ocaml-camlp4-devel >= 3.11 +BuildRequires: ocaml-ocamldoc >= 3.11 BuildRequires: python-devel BuildRequires: xz Requires: python-base @@ -48,8 +50,7 @@ used (by us and others) for finding and fixing bugs in systems code. %setup -qn %name-%rversion %build -# not autotools configure, don't use macro -./configure --prefix=%{_prefix} --opt +%configure make %{?_smp_mflags} %install @@ -58,22 +59,25 @@ make %{?_smp_mflags} export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} ->debugfiles.list ->debugsources.list +: >debugfiles.list +: >debugsources.list b="%buildroot" -make install DESTDIR="$b" MANDIR="%_mandir" LIBDIR="%_libdir" +make install DESTDIR="$b"; # Remove coccilib, don't have the deps rm -Rf "$b/%_datadir/%name"/{commons,globals,ocaml,parsing_c} \ "$b/%_mandir/man3"/Coccilib*; +mkdir -p "$b/%_libdir"; +mv "$b/%_datadir/%name/dllpycaml_stubs.so" "$b/%_libdir/"; + %files %defattr(-,root,root) %doc authors.txt bugs.txt changes.txt copyright.txt credits.txt %doc license.txt readme.txt -%doc %_mandir/*/* -%_bindir/* -%_libdir/*.so +%doc %_mandir/man?/* +%_bindir/spatch* +%_libdir/dllpycaml_stubs.so %_datadir/%name %changelog