From 8966ba2cff0f98994942afe4db8a6fba856170ce Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 8 Oct 2019 14:43:28 -0400 Subject: [PATCH] git-annex-standalone.rpm: Fix the git-annex-shell symlink --- CHANGELOG | 1 + .../Incorrectly_linked_git_annex_shell_in_standalone_rpm.mdwn | 2 ++ standalone/rpm/git-annex-standalone.spec | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 3475fb903b..dd692efc16 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -23,6 +23,7 @@ git-annex (7.20190913) UNRELEASED; urgency=medium git status unncessarily running the clean filter on the file. * uninit: Remove several git hooks that git-annex init sets up. * uninit: Remove the smudge and clean filters that git-annex init sets up. + * git-annex-standalone.rpm: Fix the git-annex-shell symlink. -- Joey Hess Thu, 19 Sep 2019 11:11:19 -0400 diff --git a/doc/bugs/Incorrectly_linked_git_annex_shell_in_standalone_rpm.mdwn b/doc/bugs/Incorrectly_linked_git_annex_shell_in_standalone_rpm.mdwn index 8d8e0820c8..3da9a2ac7c 100644 --- a/doc/bugs/Incorrectly_linked_git_annex_shell_in_standalone_rpm.mdwn +++ b/doc/bugs/Incorrectly_linked_git_annex_shell_in_standalone_rpm.mdwn @@ -40,3 +40,5 @@ Usage: git-annex COMMAND Git annex does exactly what I want, without the complicated setup or fees of git lfs. Thanks for your work maintaining this project! +> [[fixed|done]] in git; the rpm itself will only get generated at the next +> release though. --[[Joey]] diff --git a/standalone/rpm/git-annex-standalone.spec b/standalone/rpm/git-annex-standalone.spec index f3590a97b3..1e44d79dcd 100644 --- a/standalone/rpm/git-annex-standalone.spec +++ b/standalone/rpm/git-annex-standalone.spec @@ -35,7 +35,7 @@ mkdir -p %{buildroot}/usr/lib/ cp -a %{buildroot}/../git-annex.linux %{buildroot}/usr/lib mkdir -p %{buildroot}/usr/bin/ ln -sf /usr/lib/git-annex.linux/git-annex %{buildroot}/usr/bin/git-annex -ln -sf /usr/lib/git-annex.linux/git-annex %{buildroot}/usr/bin/git-annex-shell +ln -sf /usr/lib/git-annex.linux/git-annex-shell %{buildroot}/usr/bin/git-annex-shell %files %attr(-, root, root)