From 995dc4ee6af6d0ec862ffc3888aa3a3eb3ab23de Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 6 Oct 2010 04:21:44 +0200
Subject: [PATCH] Server starts OK.

---
 pkg/fedora/diaspora-bundle.spec |  4 ----
 pkg/fedora/diaspora.spec        | 11 +++++++++--
 pkg/fedora/make_dist.sh         | 28 ++++++++++++++++++++++------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/pkg/fedora/diaspora-bundle.spec b/pkg/fedora/diaspora-bundle.spec
index ccf7018c2..87656f110 100644
--- a/pkg/fedora/diaspora-bundle.spec
+++ b/pkg/fedora/diaspora-bundle.spec
@@ -65,16 +65,12 @@ pushd bundle/ruby/1.8/
 
     chmod 755 gems/thin-1.2.7/example/async_chat.ru
     chmod 755 gems/thin-1.2.7/example/async_tailer.ru
-    #chmod 644 master/public/stylesheets/brandongrotesque_light/demo.html
     chmod 644 gems/i18n-0.4.1/MIT-LICENSE 
     chmod 755 gems/abstract-1.0.0/abstract.gemspec
     chmod 644 gems/mini_magick-2.1/MIT-LICENSE
-    #chmod 644 master/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg
     chmod 755 gems/thin-1.2.7/lib/thin/controllers/service.sh.erb
     chmod 644 gems/treetop-1.4.8/spec/compiler/test_grammar.tt
 
-    #sed -i -e "s|\r||" master/public/javascripts/jquery.cycle/src/jquery.cycle.lite.js
-    #sed -i -e "s|\r||" master/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
 popd
 
 
diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
index 83355b87e..6adab3db1 100644
--- a/pkg/fedora/diaspora.spec
+++ b/pkg/fedora/diaspora.spec
@@ -23,6 +23,9 @@ Source:         %{name}-%{version}-%{git_release}.tar.gz
 Source1:        diaspora-ws
 BuildArch:	noarch
 
+# See http://github.com/diaspora/diaspora/issues/issue/393
+Patch0:		source-fix.patch
+
 BuildRequires:  git
 
 Requires(pre):  shadow-utils
@@ -44,9 +47,13 @@ exit 0
 
 %prep
 %setup -q -n %{name}-%{version}-%{git_release}
+pushd master 
+%patch0 -p1
+popd
 
-mkdir diaspora/tmp || :
-find . -name .git  | xargs rm -rf || :
+
+mkdir master/tmp || :
+#find . -name .git  | xargs rm -rf || :
 find . -type f -exec \
     sed -i 's|^#!/usr/local/bin/ruby|#!/usr/bin/ruby|' {} \; > /dev/null
 
diff --git a/pkg/fedora/make_dist.sh b/pkg/fedora/make_dist.sh
index 3d5828e30..7fbaea2aa 100755
--- a/pkg/fedora/make_dist.sh
+++ b/pkg/fedora/make_dist.sh
@@ -143,7 +143,8 @@ function make_dist
     cp diaspora.logconf  dist/${RELEASE_DIR}
     cd dist
     mkdir ${RELEASE_DIR}/master
-    cp -ar diaspora/*  diaspora/.gitignore ${RELEASE_DIR}/master	
+    cp -ar diaspora/*  diaspora/.git* ${RELEASE_DIR}/master	
+    cp -r ../.bundle ${RELEASE_DIR}/master
     mv  ${RELEASE_DIR}/master/diaspora.spec  ${RELEASE_DIR}
     tar czf ${RELEASE_DIR}.tar.gz  ${RELEASE_DIR} && rm -rf ${RELEASE_DIR}
 }
@@ -172,9 +173,22 @@ function make_bundle()
        	cd dist
 	    rm -rf $bundle_name 
 	    mkdir -p $bundle_name/bundle
-	    pushd diaspora
-	        bundle  install --deployment --path="../$bundle_name/bundle"  --without=test rdoc
-	       cp AUTHORS Gemfile GNU-AGPL-3.0 COPYRIGHT "../$bundle_name"
+	    pushd diaspora > /dev/null
+set -x
+                rm -rf devise.tmp
+                git clone http://github.com/BadMinus/devise.git devise.tmp
+                ( cd devise.tmp; gem build devise.gemspec)
+                gem install --install-dir "../$bundle_name/bundle/ruby/1.8" \
+                            --no-rdoc --no-ri                      \
+                            --ignore-dependencies                  \
+                            devise.tmp/devise-1.1.rc1.gem  &&
+                   rm -rf devise.tmp
+
+	        bundle install --deployment                      \
+                               --path="../$bundle_name/bundle"   \
+                               --without=test rdoc
+
+	        cp AUTHORS Gemfile GNU-AGPL-3.0 COPYRIGHT "../$bundle_name"
             popd
             tar czf $bundle_name.tar.gz $bundle_name
     }
@@ -211,11 +225,13 @@ function make_links()
 function usage()
 {
     	cat <<- EOF
-		Usage: make_dist [-c commit] <dist|bundle|fix_gemlock>
+
+		Usage: make_dist [-c commit] <dist|bundle|links>
+
 		-c             Use a given commit, defaults to last checked in.
 		dist           Build a diaspora application tarball.
 		bundle         Build a bundler(1) bundle for diaspora.
-		fix_gemlock    Try to fix out-of order gemlock, VERY INTRUSIVE.
+		links          Symlink bundle and source tarballs to rpm sourde dir.
 		
 		All results are stored in dist/
 	EOF