first version

2 files changed, 10 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81819b05db27..37bd517f89c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = retroshare-git
+pkgbase = retroshare-git-no-sqlcipher
 	pkgdesc = Serverless encrypted instant messenger with filesharing, chatgroups, e-mail.
-	pkgver = v0.6.0.RC2.r49.gd09b636
+	pkgver = v0.6.0.RC2.r57.g48c3eed
 	pkgrel = 1
 	url = http://retroshare.sourceforge.net/
 	install = retroshare.install
@@ -16,13 +16,13 @@ pkgbase = retroshare-git
 	depends = libgnome-keyring
 	depends = libxss
 	depends = libmicrohttpd
-	depends = sqlite
 	provides = retroshare
 	conflicts = retroshare
+	conflicts = retroshare-git
 	source = retroshare::git+https://github.com/RetroShare/RetroShare.git
 	source = retroshare.install
 	sha256sums = SKIP
 	sha256sums = 47c23238cbfabb6f07b6a25666ee5941243176360ca28ec31378d94e87326ec1
 
-pkgname = retroshare-git
+pkgname = retroshare-git-no-sqlcipher
 
diff --git a/PKGBUILD b/PKGBUILD
index fd76c4f531b3..65a64e4831ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,18 +11,18 @@ _build_voip=false
 ### Nothing to be changed below this line ###
 
 _pkgname=retroshare
-pkgname=${_pkgname}-git
-pkgver=v0.6.0.RC2.r52.gf6b830d
+pkgname=${_pkgname}-git-no-sqlcipher
+pkgver=v0.6.0.RC2.r57.g48c3eed
 pkgrel=1
 pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="http://retroshare.sourceforge.net/"
 license=('GPL' 'LGPL')
 
-depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss' 'libmicrohttpd' 'sqlite')
+depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss' 'libmicrohttpd')
 makedepends=('git')
 provides=("${_pkgname}")
-conflicts=("${_pkgname}")
+conflicts=("${_pkgname}" "${_pkgname}-git")
 
 install='retroshare.install'
 
@@ -44,8 +44,8 @@ pkgver() {
 build() {
 	cd "${srcdir}/${_pkgname}"
 
-	_qmake='qmake-qt4'
-  	_qmake='qmake-qt4  DEFINES+=NO_SQLCIPHER'
+	_qmake='qmake-qt4 DEFINES+=NO_SQLCIPHER'
+
 	#
 	# BUILD HERE
 	#