Refactored into separate generic, source dir + distro addons.

pkg/bootstrap-fedora-diaspora.sh

@@ -26,7 +26,7 @@ getent passwd diaspora  >/dev/null || {
 
 su - diaspora <<EOF
 
-set -x
+#set -x
     [ -e "\$HOME/.rvm/scripts/rvm" ] || {
     echo '#### Installing rvm ####'
     wget  http://rvm.beginrescueend.com/releases/rvm-install-head

pkg/fedora/README.md

@@ -54,6 +54,7 @@ apache/passenger setup. After configuration, start with:
     /sbin/service diaspora-wsd start
     /sbin/service httpd restart
 
+<<<<<<< HEAD
 prepare-rpm.sh prepare creates links  also for all files listed in SOURCES.
 Typically, this is  secondary sources. *make-dist.sh source*
 
@@ -91,6 +92,11 @@ is generated.
 
 #### Notes
 
+prepare-rpm.sh prepare creates links  also for all files listed in SOURCES.
+Typically, this is  secondary sources. *make-dist.sh source*
+applies all patches named *.patch in this directory after checking out
+source from git.
+
 The spec-files in dist/ are patched by *./prepare-rpm.sh to reference
 correct versions of diaspora and diaspora-bundle. The diaspora-bundle
 is only updated if Gemfile is updated, upgrading diaspora doesn't

pkg/fedora/dist

@@ -1 +0,0 @@
-../source/dist/

pkg/ubuntu/add-bundle.diff

@@ -1,11 +0,0 @@
-diff --git a/.bundle/config b/.bundle/config
-new file mode 100644
-index 0000000..1c3e2ce
---- /dev/null
-+++ b/.bundle/config
-@@ -0,0 +1,5 @@
-+---
-+BUNDLE_FROZEN: "1"
-+BUNDLE_DISABLE_SHARED_GEMS: "1"
-+BUNDLE_WITHOUT: test:rdoc
-+BUNDLE_PATH: vendor/bundle