owncloud-client-1.6.2-2: updating version

3 files changed, 33 insertions, 27 deletions

diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
index 594d3ec20..32b344f79 100644
--- a/pcr/owncloud-client/PKGBUILD
+++ b/pcr/owncloud-client/PKGBUILD
@@ -1,14 +1,13 @@
-# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
+# Maintainer (Arch): Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 # https://github.com/zizzfizzix/pkgbuilds
 # Maintainer: Jorge Araya Navarro <shackra@riseup.net>
-#
+
 ##############################################################
 #### The section below can be adjusted to suit your needs ####
 ##############################################################
 
 # What type of build do you want?
 # See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported.
-# Default is RelWithDebInfo to help with debugging.
 
 _buildtype='Release'
 
@@ -16,41 +15,48 @@ _buildtype='Release'
 
 _name=mirall
 pkgname=owncloud-client
-pkgver=1.5.1
-pkgrel=3
+pkgver=1.6.2
+pkgrel=2
 pkgdesc='ownCloud client based on mirall'
-arch=('i686' 'x86_64' 'armv7h')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://owncloud.org/'
 license=('GPL2')
-depends=('qt4' 'qtkeychain' 'qtwebkit')
-makedepends=('cmake')
-provides=('mirall' 'owncloud-client' 'ocsync')
-conflicts=('mirall-git')
+depends=('qtkeychain' 'qtwebkit' 'neon')
+makedepends=('cmake' 'python-sphinx')
+provides=('mirall' 'ocsync')
+conflicts=('mirall-git' 'ocsync')
 install=owncloud-client.install
 backup=('etc/ownCloud/sync-exclude.lst')
-source=("http://download.owncloud.com/desktop/stable/${_name}-${pkgver}.tar.bz2")
-sha256sums=('79c41f8c72c994ab803b7053a1c7e0a46bbd20c25c1eed900e1c98433745daee')
+source=("https://download.owncloud.com/desktop/stable/${_name}-${pkgver}.tar.bz2"
+        "https://download.owncloud.com/desktop/stable/${_name}-${pkgver}.tar.bz2.asc"
+        'man.patch')
+md5sums=('52518b622e9b2c151e64a4b56bcf2414'
+         'SKIP'
+         '4e252cf4df3276c3dadf45232b4e17a2')
 
 if [[ ! ${_buildtype} == 'Release' ]] && [[ ! ${_buildtype} == 'release' ]]; then
-  options=(!strip)
+  options=('debug')
 fi
 
 prepare() {
   if [[ -e ${srcdir}/${_name}-${pkgver}-build ]]; then rm -rf ${srcdir}/${_name}-${pkgver}-build; fi
   mkdir ${srcdir}/${_name}-${pkgver}-build
+
+  cd ${srcdir}/${_name}-${pkgver}
+  patch -p0 -i ${srcdir}/man.patch
 }
 
 build() {
   cd ${srcdir}/${_name}-${pkgver}-build
 
-  cmake -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
+  cmake -DBUILD_WITH_QT4=on \
         -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DCMAKE_INSTALL_LIBDIR=lib \
         -DCMAKE_BUILD_TYPE=${_buildtype} \
-        -DCSYNC_INCLUDE_PATH=/usr/include/ocsync \
         -DCMAKE_INSTALL_SYSCONFDIR=/etc/${pkgname} \
         ../${_name}-${pkgver}
   make
+  make doc-man
 }
 
 package() {
diff --git a/pcr/owncloud-client/man.patch b/pcr/owncloud-client/man.patch
new file mode 100644
index 000000000..8adc07546
--- /dev/null
+++ b/pcr/owncloud-client/man.patch
@@ -0,0 +1,11 @@
+--- doc/CMakeLists.txt	2014-06-02 20:38:04.000000000 +0300
++++ doc/CMakeLists.txt_	2014-06-03 23:22:59.809715820 +0300
+@@ -4,7 +4,7 @@
+     set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
+     # HTML output directory
+     set(SPHINX_HTML_DIR     "${CMAKE_CURRENT_BINARY_DIR}/html")
+-    set(SPHINX_MAN_DIR      "${CMAKE_CURRENT_BINARY_DIR}/man")
++    set(SPHINX_MAN_DIR      "${CMAKE_CURRENT_BINARY_DIR}/man1")
+     set(SPHINX_PDF_DIR      "${CMAKE_CURRENT_BINARY_DIR}/latex")
+     set(SPHINX_QCH_DIR      "${CMAKE_CURRENT_BINARY_DIR}/qthelp")
+     set(SPHINX_HTMLHELP_DIR "${CMAKE_CURRENT_BINARY_DIR}/htmlhelp")
diff --git a/pcr/owncloud-client/owncloud-client.desktop b/pcr/owncloud-client/owncloud-client.desktop
deleted file mode 100644
index 005e52219..000000000
--- a/pcr/owncloud-client/owncloud-client.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=ownCloud 2012 client
-GenericName=File Sync
-TryExec=owncloud
-Exec=owncloud %u
-Comment=ownCloud - Your Cloud, Your Data, Your Way!
-Icon=mirall
-Terminal=false
-Categories=Qt;Utility;