[rpms/keychain] rawhide: spec cleanup and modernization

[rpms/keychain] rawhide: spec cleanup and modernization

[Filipe Rosset]

A new commit has been pushed.

Repo   : rpms/keychain
Branch : rawhide
Commit : bef037547f96eaefa0fdc9153db66ef50b0598eb
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date   : 2026-06-08T20:58:40-03:00
Stats  : +18/-22 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/keychain/c/bef037547f96eaefa0fdc9153db66ef50b0598eb?branch=rawhide

Log:
spec cleanup and modernization

---
diff --git a/.gitignore b/.gitignore
index 5742e6b..1506b9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-keychain-2.6.8.tar.bz2
-/keychain-2.8.0.tar.bz2
-/keychain-2.8.5.tar.gz
-/keychain-2.9.2.tar.gz
-/keychain-2.9.8.tar.gz
+/keychain-*.tar.gz

diff --git a/keychain.spec b/keychain.spec
index 0d0fb4b..1cb3b71 100644
--- a/keychain.spec
+++ b/keychain.spec
@@ -3,10 +3,10 @@ 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
+URL:            https://github.com/danielrobbins/%{name}
+Source:         https://github.com/danielrobbins/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+Source1:        %{name}.sh
+Source2:        %{name}.csh
 Source3:        README.Fedora
 BuildArch:      noarch
 BuildRequires:  bash-completion
@@ -27,30 +27,30 @@ local machine is rebooted.
 %autosetup
 cp %{SOURCE3} .
 # Remove /usr/ucb from PATH as it's not used in Fedora
-sed -i -e 's|/usr/ucb:||' keychain.sh
+sed -i -e 's|/usr/ucb:||' %{name}.sh
 # Remove shebang from bash completion script
-sed -i -e '1{\@^#!/usr/bin/env bash@d}' completions/keychain.bash
+sed -i -e '1{\@^#!/usr/bin/env bash@d}' completions/%{name}.bash
 
 %build
-%make_build keychain keychain.1
+%make_build %{name} %{name}.1
 
 %install
-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
+install -D -p -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
+install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
+install -D -p -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
 # Bash completion
-install -D -p -m 0644 completions/keychain.bash %{buildroot}%{_datadir}/bash-completion/completions/keychain
+install -D -p -m 0644 completions/%{name}.bash %{buildroot}%{bash_completions_dir}/%{name}
 
 %files
 %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
+%config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh
+%config(noreplace) %{_sysconfdir}/profile.d/%{name}.csh
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
+%{bash_completions_dir}/%{name}
 
 %check
 # Basic check to ensure the binary was built correctly and to silent rpmlint