From 588c4c7c7ca2a8bf38ae5b11cb1f72b03b3d1538 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 21 Sep 2022 23:29:51 -0400 Subject: [PATCH] lint: update filter rules We removed '%{_emacs_version}' in 3395646 (remove --with/--without emacs build conditional, 2022-06-13). Drop the unnecessary filter from the rpmlint config. Add filters for several new checks in rpmlint 2.x: files-duplicate; package-with-huge-docs; and potential-bashisms. Also ignore unused-direct-shlib-dependency for libpcre2. While this is accurate, the additional linking would be tricky to remove from the upstream Makefile. It would almost certainly not be worth the effort. Lastly (even though it's the first line in the file), drop the unneeded 'from Config import *' directive. The rpmlint config is no longer loaded directly as python code (yay!). --- git.rpmlintrc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/git.rpmlintrc b/git.rpmlintrc index 9fd93ce..0c6926b 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -1,5 +1,3 @@ -from Config import * - # the dictionary is a bit limited addFilter("git.* spelling-error %description .* subpackages") addFilter("git-subtree.* spelling-error %description .* (subdirectory|subproject|subtree)") @@ -23,5 +21,16 @@ addFilter("git-core\..*: W: no-manual-page-for-binary") # similarly ignore the warning when git-cvs and git-p4 are disabled addFilter("git.* obsolete-not-provided git-(cvs|gnome-keyring|p4)") -# we BR emacs which requires emacs-common and provides %{_emacs_version} -addFilter("git.(spec|src): .* Possible unexpanded macro in: Requires:.*emacs-filesystem >= %{_emacs_version}") +# git-svn has both man and html docs and only a single command +addFilter('git-svn\..*: W: package-with-huge-docs') + +# ignore potential "bashisms" in docs +addFilter('git-core-doc\.noarch: W: potential-bashisms /usr/share/doc/git/') + +# ignore unused-direct-shlib-dependency for libpcre; while it probably could be +# removed from some binaries, the cost of doing so isn't worth the gain. +addFilter('git-(core|daemon)\..*: W: unused-direct-shlib-dependency .* /lib64/libpcre2-.*') + +# ignore duplicate gvimdiff/nvimdiff files; they are only 29 bytes, sourcing the same base +# vimdiff mergetool +addFilter('git-core\..*: W: files-duplicate /usr/libexec/git-core/mergetools/[gn]vimdiff')