From 04984d576a5152764b45807415d5701a9f678902 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Sat, 30 Oct 2010 15:48:33 +0200
Subject: [PATCH] bugfix

---
 pkg/fedora/diaspora-bundle.spec | 1 +
 pkg/fedora/diaspora-setup       | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg/fedora/diaspora-bundle.spec b/pkg/fedora/diaspora-bundle.spec
index 7a03479a4..5b56f4d56 100644
--- a/pkg/fedora/diaspora-bundle.spec
+++ b/pkg/fedora/diaspora-bundle.spec
@@ -199,6 +199,7 @@ popd
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/diaspora-bundle
 cp -ar  vendor  $RPM_BUILD_ROOT/%{_libdir}/diaspora-bundle
+cp -a Gemfile Gemfile.lock $RPM_BUILD_ROOT/%{_libdir}/diaspora-bundle
 
 find  %{buildroot}/%{_libdir}/diaspora-bundle  \
     -type d  -fprintf dirs '%%%dir "%%p"\n'
diff --git a/pkg/fedora/diaspora-setup b/pkg/fedora/diaspora-setup
index 726cfe148..4c5138571 100755
--- a/pkg/fedora/diaspora-setup
+++ b/pkg/fedora/diaspora-setup
@@ -4,6 +4,7 @@
 #
 #  Usage: # ./diaspora-setup [external hostname]
 #
+export PATH=$PATH:/usr/local/bin
 
 arg_hostname="$1"
 
@@ -22,10 +23,12 @@ test -n "$services" && {
 
 cd /usr/share/diaspora/master
 
+libdir=$(rpm --eval %_libdir)
+
 rm -rf vendor
-ln -s /usr/lib/diaspora-bundle/vendor .
-ln -sf /usr/lib/diaspora-bundle/Gemfile .
-ln -sf /usr/lib/diaspora-bundle/Gemfile.lock .
+ln -s $libdir/diaspora-bundle/vendor .
+ln -sf $libdir/diaspora-bundle/Gemfile .
+ln -sf $libdir/diaspora-bundle/Gemfile.lock .
 
 test -e config/app_config.yml ||
     cp config/app_config.yml.example config/app_config.yml