Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

3 files changed, 30 insertions, 25 deletions

diff --git a/pcr/ocsync/PKGBUILD b/pcr/ocsync/PKGBUILD
index 34ce2f62c..97bc26754 100644
--- a/pcr/ocsync/PKGBUILD
+++ b/pcr/ocsync/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 # https://github.com/zizzfizzix/pkgbuilds
-
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+#
 ##############################################################
 #### The section below can be adjusted to suit your needs ####
 ##############################################################
@@ -14,28 +15,31 @@ _buildtype="Release"
 ##############################################################
 
 pkgname=ocsync
-pkgver=0.70.5
-pkgrel=1
-pkgdesc="A file synchronizer especially designed for you, the normal user."
+pkgver=0.80.0
+pkgrel=3
+pkgdesc="A file synchronizer especially designed for you, the normal user. Dependency of owncloud-client."
 arch=("i686" "x86_64")
 url="http://www.csync.org"
 license=('GPL2')
-depends=('sqlite3' 'iniparser' 'neon' 'smbclient' 'libssh')
+depends=('sqlite3' 'iniparser' 'neon')
 makedepends=('cmake')
-#optdepends=('samba: smb support' 'libssh: sftp support')
+optdepends=('libssh: sftp support')
 provides=('csync' 'csync-owncloud')
 conflicts=('csync' 'csync-owncloud')
+backup=('etc/ocsync/ocsync.conf' 'etc/ocsync/ocsync_exclude.conf')
 source=("http://download.owncloud.com/download/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7c8b6f260cc53d29c4355f6837990329')
+md5sums=('db46cdb4c710a607dfc062ed0a413b35')
 
-# Clean options array to strip pkg if release buildtype is chosen
-if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then
-  options=()
+if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
+  options=(!strip)
 fi
 
-build() {
+prepare() {
   if [[ -e ${srcdir}/${pkgname}-${pkgver}-build ]]; then rm -rf ${srcdir}/${pkgname}-${pkgver}-build; fi
   mkdir ${srcdir}/${pkgname}-${pkgver}-build
+}
+
+build() {
   cd ${srcdir}/${pkgname}-${pkgver}-build
   
   cmake -DCMAKE_BUILD_TYPE=${_buildtype} \
diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
index 69905f40a..a4e86099b 100644
--- a/pcr/owncloud-client/PKGBUILD
+++ b/pcr/owncloud-client/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 # https://github.com/zizzfizzix/pkgbuilds
-
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+#
 ##############################################################
 #### The section below can be adjusted to suit your needs ####
 ##############################################################
@@ -15,31 +16,32 @@ _buildtype="Release"
 
 _name=mirall
 pkgname=owncloud-client
-pkgver=1.2.3
-pkgrel=1
+pkgver=1.3.0
+pkgrel=2
 pkgdesc="ownCloud client based on mirall"
 arch=('i686' 'x86_64')
 url="http://owncloud.org/"
 license=('GPL2')
 depends=('qt4' 'ocsync')
 makedepends=('cmake')
+optdepends=('qtkeychain: safe password storage')
 provides=('mirall' 'owncloud-client')
 conflicts=('mirall-git')
 install=owncloud-client.install
 backup=('etc/owncloud-client/sync-exclude.lst')
-source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2"
-        "${pkgname}.desktop")
-md5sums=('a3aa2cb1b9ccb13c7e8b0ef8a1b539df'
-         'e223d162626c2ff54efebaa90a182d81')
-
-# Clean options array to strip pkg if release buildtype is chosen
-if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then
-  options=()
+source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2")
+md5sums=('ee2e7bafc714399f2027fefed853f968')
+
+if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
+  options=(!strip)
 fi
 
-build() {
+prepare() {
   if [[ -e ${srcdir}/${_name}-${pkgver}-build ]]; then rm -rf ${srcdir}/${_name}-${pkgver}-build; fi
   mkdir ${srcdir}/${_name}-${pkgver}-build
+}
+
+build() {
   cd ${srcdir}/${_name}-${pkgver}-build
 
   cmake -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
@@ -55,5 +57,4 @@ build() {
 package() {
   cd ${srcdir}/${_name}-${pkgver}-build
   make DESTDIR=${pkgdir} install
-  install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
 }
diff --git a/pcr/owncloud-client/owncloud-client.install b/pcr/owncloud-client/owncloud-client.install
index e216754c7..eecc35ccd 100644
--- a/pcr/owncloud-client/owncloud-client.install
+++ b/pcr/owncloud-client/owncloud-client.install
@@ -1,5 +1,5 @@
 post_install() {
-  xdg-icon-resource forceupdate --theme hicolor
+  xdg-icon-resource forceupdate --theme hicolor > /dev/null
 }
 
 post_upgrade() {