[rpms/keychain] f43: spec cleanup and modernization, silent rpmlint

[rpms/keychain] f43: spec cleanup and modernization, silent rpmlint

[Filipe Rosset]

A new commit has been pushed.

Repo   : rpms/keychain
Branch : f43
Commit : 769b335eb24071690f7bb80344d585898c09a894
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date   : 2026-03-14T21:55:49+00:00
Stats  : +34/-26 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/keychain/c/769b335eb24071690f7bb80344d585898c09a894?branch=f43

Log:
spec cleanup and modernization, silent rpmlint

---
diff --git a/keychain.spec b/keychain.spec
index 0074446..0d0fb4b 100644
--- a/keychain.spec
+++ b/keychain.spec
@@ -1,17 +1,18 @@
-Name:       keychain
-Summary:    Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
-Version:    2.9.8
-Release:    %autorelease
-License:    GPL-2.0-only
-URL:        https://github.com/danielrobbins/keychain
-Source0:    https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz
-Source1:    keychain.sh
-Source2:    keychain.csh
-Source3:    README.Fedora
-BuildArch:  noarch
-BuildRequires: make
-BuildRequires: perl-podlators
-Requires:   findutils
+Name:           keychain
+Summary:        Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
+Version:        2.9.8
+Release:        %autorelease
+License:        GPL-2.0-only
+URL:            https://github.com/danielrobbins/keychain
+Source0:        https://github.com/danielrobbins/keychain/archive/%{version}/keychain-%{version}.tar.gz
+Source1:        keychain.sh
+Source2:        keychain.csh
+Source3:        README.Fedora
+BuildArch:      noarch
+BuildRequires:  bash-completion
+BuildRequires:  make
+BuildRequires:  perl-podlators
+Requires:       findutils
 
 
 %description
@@ -23,30 +24,37 @@ passphrase from once per new login session to once every time your
 local machine is rebooted.
 
 %prep
-%setup -q
+%autosetup
+cp %{SOURCE3} .
+# Remove /usr/ucb from PATH as it's not used in Fedora
 sed -i -e 's|/usr/ucb:||' keychain.sh
+# Remove shebang from bash completion script
+sed -i -e '1{\@^#!/usr/bin/env bash@d}' completions/keychain.bash
 
 %build
-make keychain keychain.1
+%make_build keychain keychain.1
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-mkdir -p %{buildroot}%{_mandir}/man1
-install -pm 755 keychain %{buildroot}%{_bindir}/keychain
-install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh
-install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh
-install -pm 644 keychain.1 %{buildroot}%{_mandir}/man1
-install -pm 644 %{SOURCE3} README.Fedora
+install -D -p -m 0755 keychain %{buildroot}%{_bindir}/keychain
+install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh
+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh
+install -D -p -m 0644 keychain.1 %{buildroot}%{_mandir}/man1/keychain.1
+
+# Bash completion
+install -D -p -m 0644 completions/keychain.bash %{buildroot}%{_datadir}/bash-completion/completions/keychain
 
 %files
-%doc ChangeLog.md README.md README.Fedora
 %license COPYING.txt
+%doc ChangeLog.md README.md README.Fedora
 %config(noreplace) %{_sysconfdir}/profile.d/keychain.sh
 %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh
 %{_bindir}/keychain
 %{_mandir}/man1/keychain.1*
+%{_datadir}/bash-completion/completions/keychain
+
+%check
+# Basic check to ensure the binary was built correctly and to silent rpmlint
+./%{name} --version
 
 %changelog
 %autochangelog