diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2012-01-25 13:20:39 -0600 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2012-01-25 13:20:39 -0600 |
| commit | 03c05983cd3a4d4cf49960240a0bafd108a1dc35 (patch) | |
| tree | 5e64ba6c3b399b6e1d1a6ea86ee9cf564f15614a /social/diaspora-git | |
| parent | d3b862d93eb5f0f6d819dca3588ebbd6194f9967 (diff) | |
Commiting libre package diaspora-git-20111229-1
Diffstat (limited to 'social/diaspora-git')
| -rw-r--r-- | social/diaspora-git/PKGBUILD | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/social/diaspora-git/PKGBUILD b/social/diaspora-git/PKGBUILD index 77a11d701..57459173d 100644 --- a/social/diaspora-git/PKGBUILD +++ b/social/diaspora-git/PKGBUILD @@ -7,11 +7,7 @@ pkgbase=diaspora-git pkgname=('diaspora-mysql-git' 'diaspora-postgresql-git' 'diaspora-sqlite-git') -<<<<<<< HEAD -pkgver=20110623 -======= pkgver=20111229 ->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c pkgrel=1 pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network" arch=('i686' 'x86_64') @@ -54,11 +50,7 @@ build() { msg "Start making..." [[ -d $_gitname-build ]] && rm -fr $_gitname-build -<<<<<<< HEAD - git clone $_gitname $_gitname-build -======= $tsocks git clone $_gitname $_gitname-build ->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c # Include all gems export GEM_HOME="${PWD}/vendor" @@ -67,11 +59,7 @@ build() { cd ${srcdir}/${_gitname}-build -<<<<<<< HEAD - gem install bundler -======= $tsocks gem install bundler ->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c } # Helper |