| |
@@ -1,19 +1,12 @@
|
| |
- %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
| |
-
|
| |
Name: coccinelle
|
| |
Version: 1.1.1
|
| |
- Release: 1%{?dist}
|
| |
+ Release: 2%{?dist}
|
| |
Summary: Semantic patching for Linux (spatch)
|
| |
|
| |
License: GPLv2
|
| |
|
| |
- URL: http://coccinelle.lip6.fr/
|
| |
-
|
| |
- #Source0: https://coccinelle.gitlabpages.inria.fr/website/distrib/coccinelle-%{version}.tar.gz
|
| |
- # 1.1.1 was not tagged so I ran:
|
| |
- # git reset --hard 5444e1
|
| |
- # git archive --format=tar --prefix=coccinelle-1.1.1/ HEAD | gzip -9 > coccinelle-1.1.1.tar.gz
|
| |
- Source0: %{name}-%{version}.tar.gz
|
| |
+ URL: https://coccinelle.gitlabpages.inria.fr/website/
|
| |
+ Source0: https://github.com/coccinelle/coccinelle/archive/%{version}/%{name}-%{version}.tar.gz
|
| |
|
| |
# Used for running Python tests.
|
| |
Source1: test.c
|
| |
@@ -25,18 +18,16 @@
|
| |
BuildRequires: ocaml >= 3.10.0
|
| |
BuildRequires: ocaml-findlib-devel
|
| |
BuildRequires: ocaml-ocamldoc
|
| |
- # These are probably bundled. Reenable them when camlp4 is working.
|
| |
- #BuildRequires: ocaml-sexplib-devel
|
| |
+ BuildRequires: ocaml-parmap-devel
|
| |
BuildRequires: ocaml-pcre-devel
|
| |
- BuildRequires: ocaml-extlib-devel
|
| |
BuildRequires: ocaml-menhir
|
| |
BuildRequires: ocaml-num-devel
|
| |
BuildRequires: latexmk
|
| |
- BuildRequires: /usr/bin/pdflatex
|
| |
BuildRequires: texlive-boxedminipage
|
| |
BuildRequires: texlive-comment
|
| |
BuildRequires: texlive-endnotes
|
| |
BuildRequires: texlive-ifsym
|
| |
+ BuildRequires: texlive-latex
|
| |
BuildRequires: texlive-listings
|
| |
BuildRequires: texlive-moreverb
|
| |
BuildRequires: texlive-multirow
|
| |
@@ -46,9 +37,8 @@
|
| |
BuildRequires: texlive-xypic
|
| |
BuildRequires: hevea
|
| |
BuildRequires: python3-devel
|
| |
- BuildRequires: chrpath
|
| |
BuildRequires: bash-completion
|
| |
- BuildRequires: make
|
| |
+ BuildRequires: make
|
| |
|
| |
# This stops the automatic dependency generator adding some bogus
|
| |
# OCaml dependencies. Unfortunately we have to keep adding modules to
|
| |
@@ -56,69 +46,28 @@
|
| |
# should be a better way, but I don't know what.
|
| |
%{lua:
|
| |
modules = {
|
| |
- 'ANSITerminal',
|
| |
- 'Ast0_cocci',
|
| |
- 'Ast_c',
|
| |
- 'Ast_cocci',
|
| |
- 'Bytearray',
|
| |
- 'Commands',
|
| |
- 'Common',
|
| |
- 'Config',
|
| |
'Control_flow_c',
|
| |
'Cpp_token_c',
|
| |
'Danger',
|
| |
'Data',
|
| |
- 'Dumper',
|
| |
- 'Exposed_modules',
|
| |
- 'Externalanalysis',
|
| |
- 'Flag',
|
| |
'Flag_parsing_cocci',
|
| |
- 'Get_constants2',
|
| |
'Includes',
|
| |
'Includes_cache',
|
| |
- 'Iteration',
|
| |
- 'Lexer_c',
|
| |
'Lexer_parser',
|
| |
- 'Lib_parsing_c',
|
| |
- 'Mapb',
|
| |
- 'Oassoc',
|
| |
- 'Oassoc_buffer',
|
| |
- 'Oassocb',
|
| |
- 'Oassoch',
|
| |
- 'Objet',
|
| |
- 'Ocollection',
|
| |
- 'Ograph2way',
|
| |
'Ograph_extended',
|
| |
- 'Oset',
|
| |
- 'Osetb',
|
| |
- 'Oseti',
|
| |
- 'Parmap_utils',
|
| |
- 'Parse_c',
|
| |
- 'Parser_c',
|
| |
'Parsing_consistency_c',
|
| |
'Parsing_hacks',
|
| |
'Parsing_recovery_c',
|
| |
'Parsing_stat',
|
| |
- 'Pretty_print_c',
|
| |
- 'Regexp',
|
| |
'Regexp_pcre',
|
| |
'Semantic_c',
|
| |
- 'Setcore',
|
| |
- 'SetPt',
|
| |
- 'Setb',
|
| |
- 'Seti',
|
| |
- 'Sexplib',
|
| |
'Stdcompat',
|
| |
'Stdcompat__init',
|
| |
'Stdcompat__stdlib_s',
|
| |
'Token_annot',
|
| |
- 'Token_c',
|
| |
'Token_helpers',
|
| |
'Token_views_c',
|
| |
'Type_annoter_c',
|
| |
- 'Type_cocci',
|
| |
- 'Visitor_ast',
|
| |
- 'Visitor_c',
|
| |
}
|
| |
local arg = "__ocaml_requires_opts"
|
| |
for i, m in ipairs(modules) do
|
| |
@@ -133,9 +82,9 @@
|
| |
# Bundled libraries.
|
| |
#
|
| |
# We could unbundle both of these, but it would require packaging them
|
| |
- # in Fedora. I don't know which version of the library is included.
|
| |
- Provides: bundled(ocaml-pycaml)
|
| |
- Provides: bundled(ocaml-parmap)
|
| |
+ # in Fedora.
|
| |
+ Provides: bundled(ocaml-pycaml) = 20200220
|
| |
+ Provides: bundled(ocaml-stdcompat) = 15
|
| |
|
| |
|
| |
%description
|
| |
@@ -181,8 +130,8 @@
|
| |
# Replace /usr/bin/env shebang with /usr/bin/python3
|
| |
sed -i '1s_^#!/usr/bin/env python$_#!/usr/bin/python3_' tools/pycocci
|
| |
|
| |
- # Remove .cvsignore files.
|
| |
- find -name .cvsignore -delete
|
| |
+ # Remove .gitignore files.
|
| |
+ find -name .gitignore -delete
|
| |
|
| |
# Convert a few files to UTF-8 encoding.
|
| |
for f in demos/demo_rule9/sym53c8xx.res demos/demo_rule9/sym53c8xx.c; do
|
| |
@@ -220,16 +169,16 @@
|
| |
EXTRACFLAGS = $(EXTRA_OCAML_FLAGS)
|
| |
' > Makefile.local
|
| |
|
| |
- %if !%opt
|
| |
- target=all-dev
|
| |
- %else
|
| |
+ %ifarch %{ocaml_native_compiler}
|
| |
target=all-release
|
| |
+ %else
|
| |
+ target=all-dev
|
| |
%endif
|
| |
|
| |
# NOTE: Do not use smp_mflags! It breaks the build.
|
| |
unset MAKEFLAGS
|
| |
|
| |
- make $target EXTLIBDIR=`ocamlc -where`/extlib
|
| |
+ make $target
|
| |
|
| |
%install
|
| |
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python/coccilib
|
| |
@@ -265,10 +214,10 @@
|
| |
|
| |
mv $RPM_BUILD_ROOT%{_bindir}/spatch $RPM_BUILD_ROOT%{_libdir}/coccinelle
|
| |
|
| |
- cp tools/pycocci $RPM_BUILD_ROOT%{_bindir}/
|
| |
+ cp -p tools/pycocci $RPM_BUILD_ROOT%{_bindir}/
|
| |
|
| |
# wrapper script, sets up env variables
|
| |
- cp scripts/spatch.sh $RPM_BUILD_ROOT%{_bindir}/spatch
|
| |
+ cp -p scripts/spatch.sh $RPM_BUILD_ROOT%{_bindir}/spatch
|
| |
chmod a+x $RPM_BUILD_ROOT%{_bindir}/spatch
|
| |
|
| |
|
| |
@@ -305,9 +254,6 @@
|
| |
%{python3_sitelib}/coccilib/
|
| |
%{_libdir}/ocaml/stublibs/*.so
|
| |
%{_libdir}/ocaml/*.cmx
|
| |
- %if !%opt
|
| |
- %config(noreplace) /etc/prelink.conf.d/%{name}.conf
|
| |
- %endif
|
| |
|
| |
|
| |
%files bash-completion
|
| |
@@ -325,8 +271,18 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Mon Dec 27 2021 Jerry James <loganjerry@gmail.com> - 1.1.1-2
|
| |
+ - Rebuild for ocaml-pcre 7.5.0
|
| |
+ - Fetch the official 1.1.1 release tarball
|
| |
+ - New URLs
|
| |
+ - Drop unused BRs: ocaml-extlib-devel, chrpath
|
| |
+ - Add ocaml-parmap-devel BR
|
| |
+ - Trim the list of filtered modules
|
| |
+ - Mark ocaml-stdcompat as bundled
|
| |
+ - Minor spec file cleanups
|
| |
+
|
| |
* Tue Oct 05 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-1
|
| |
- - New upstream verson 1.1.1
|
| |
+ - New upstream version 1.1.1
|
| |
- OCaml 4.13.1 build
|
| |
|
| |
* Tue Jul 27 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-5
|
| |
jjames
commented 2 years ago
Also:
- Fetch the official 1.1.1 release tarball
- New URLs
- Drop unused BRs: ocaml-extlib-devel, chrpath
- Add ocaml-parmap-devel BR
- Trim the list of filtered modules
- Mark ocaml-stdcompat as bundled
- Minor spec file cleanups
As noted on the OCaml mailing list recently, I would like to update some OCaml packages, including this one. If this pull request looks good to you, go ahead and merge it, but please do not start a build at this time. I will build all of the listed packages in a side tag to avoid Rawhide breakage. The affected packages can all be seen in a COPR repository.
Let me know if you want any changes to this pull request.