[packages/git-annex/standalone] Cleaner way of un-hacking upstream project's mess. Added patch that might also be useful in putting

[caleb]

commit 837887a739999c653b0224ad48023b9087934fd9
Author: Caleb Maclennan <caleb at pld-linux.org>
Date:   Tue May 28 18:21:04 2013 +0300

    Cleaner way of un-hacking upstream project's mess. Added patch that might also be useful in putting together the real spec for this.

 git-annex-shell |  7 +++++++
 git-annex.spec  | 11 ++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/git-annex.spec b/git-annex.spec
index cde8ae3..e2f223f 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -9,6 +9,7 @@ URL:		http://git-annex.branchable.com/
 Source0:	http://downloads.kitenet.net/git-annex/linux/current/%{name}-amd64.tar.gz
 # Source0-md5:	dfceaa0d56d13815ba15bb50a711d1bb
 Source1:	http://downloads.kitenet.net/git-annex/linux/current/%{name}-i386.tar.gz
+Source2:	git-annex-shell
 # Source1-md5:	12bbe08f32b7d499849b600575959954
 Conflicts:	git-annex
 ExclusiveArch:	%{ix86} %{x8664}
@@ -49,12 +50,12 @@ mkdir -p opt/git-annex
 mkdir -p usr/bin
 mv git-annex.linux/* opt/git-annex
 
+%{__sed} -i 's:^base=.*:base=/opt/git-annex:' opt/git-annex/git-annex
+%{__sed} -i 's:^base=.*:base=/opt/git-annex:' opt/git-annex/git-annex-webapp
+%{__sed} -i 's:^base=.*:base=/opt/git-annex:' opt/git-annex/runshell
+
 cp opt/git-annex/git-annex usr/bin/
 cp opt/git-annex/git-annex-webapp usr/bin/
-cp opt/git-annex/runshell usr/bin/git-annex-shell
-%{__sed} -i 's:^base=.*:base=/opt/git-annex:' usr/bin/git-annex
-%{__sed} -i 's:^base=.*:base=/opt/git-annex:' usr/bin/git-annex-webapp
-%{__sed} -i 's:^base=.*:base=/opt/git-annex:' usr/bin/git-annex-shell
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -63,7 +64,7 @@ install -d $RPM_BUILD_ROOT/opt/git-annex
 install -d $RPM_BUILD_ROOT/usr/bin
 cp -a opt/git-annex/* $RPM_BUILD_ROOT/opt/git-annex
 cp -a usr/bin/* $RPM_BUILD_ROOT/usr/bin
-#install $RPM_BUILD_ROOT/opt/git-annex/git-annex
+install %{SOURCE2} $RPM_BUILD_ROOT/usr/bin/git-annex-shell
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/git-annex-shell b/git-annex-shell
new file mode 100755
index 0000000..b7d4f56
--- /dev/null
+++ b/git-annex-shell
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+if [ "x$SSH_ORIGINAL_COMMAND" != "x" ]; then
+exec /opt/git-annex/runshell git-annex-shell -c "$SSH_ORIGINAL_COMMAND"
+else
+exec /opt/git-annex/runshell git-annex-shell -c "$@"
+fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/git-annex.git/commitdiff/837887a739999c653b0224ad48023b9087934fd9