From 5c331b2580873051c5175c97432036d49be72f68 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 5 Apr 2020 11:15:11 -0400 Subject: [PATCH] fix/quiet rpmlint issues from libsecret split When the libsecret credential helper was split out in 9d91bab (split libsecret credential helper into a subpackage (#1804741), 2020-02-19), a few rpmlint errors & warnings crept in. Update the rpmlintrc file to ignore the no-documentation warning for the libsecret subpackage (replacing the gnome-keyring entry which is no longer needed). Fix an errant tab added to the spec file. Moving the libsecret credential helper to a subpackage left no binaries in the main git package, so rpmlint complains. Fixing this requires a bit more investigation and care. --- git.rpmlintrc | 2 +- git.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/git.rpmlintrc b/git.rpmlintrc index a7cb9f2..b2d9407 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -14,7 +14,7 @@ addFilter("git\..*: W: dangling-relative-symlink /usr/libexec/git-core/git-difft addFilter("git-gui.noarch: W: desktopfile-without-binary /usr/share/applications/git-gui.desktop git") # ignore no doc/manpage warnings where we don't expect any documentation -addFilter("git-(all|core|gnome-keyring)\..*: W: no-documentation") +addFilter("git-(all|core|credential-libsecret)\..*: W: no-documentation") addFilter("perl-Git-SVN.noarch: W: no-documentation") addFilter("git-core\..*: W: no-manual-page-for-binary") diff --git a/git.spec b/git.spec index 4869759..4902707 100644 --- a/git.spec +++ b/git.spec @@ -297,7 +297,7 @@ Summary: Meta-package to pull in all git tools BuildArch: noarch Requires: git = %{version}-%{release} %if %{with libsecret} -Requires: git-credential-libsecret = %{version}-%{release} +Requires: git-credential-libsecret = %{version}-%{release} %endif # endif with libsecret %if %{with cvs} @@ -1062,6 +1062,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Sat Apr 04 2020 Todd Zullinger - 2.26.0-2 - fix issue with fast-forward rebases when rebase.abbreviateCommands is set +- fix/quiet rpmlint issues from libsecret split * Thu Apr 02 2020 Björn Esser - 2.26.0-1.1 - Fix string quoting for rpm >= 4.16