version 2.3.3 (no wrapper scripts anymore)

4 files changed, 21 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db531ea50141..64af4805cea6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,19 @@
 pkgbase = cernbox
 	pkgdesc = Synchronization client for CERN's CERNBox cloud service (based on ownCloud). Note: CERN IT does not provide official support for Arch Linux. Use at your own risk.
-	pkgver = 2.1.1_1.1
-	pkgrel = 2
+	pkgver = 2.3.3_1119.1
+	pkgrel = 1
 	url = http://cernbox.web.cern.ch/
 	arch = x86_64
 	license = GPL
 	depends = neon
 	depends = qt5-webkit
+	depends = qtkeychain
 	provides = ocsync
 	provides = cernboxsync
-	source = http://cernbox.cern.ch/cernbox/doc/Linux/repo/openSUSE_13.2/x86_64/cernbox-client-2.1.1-1.1.x86_64.rpm
-	source = http://cernbox.cern.ch/cernbox/doc/Linux/repo/openSUSE_13.2/x86_64/libcernboxsync0-2.1.1-1.1.x86_64.rpm
-	source = http://cernbox.cern.ch/cernbox/doc/Linux/repo/openSUSE_13.2/x86_64/libqt5keychain0-0.5-3.1.x86_64.rpm
-	source = cernbox
-	source = cernboxcmd
-	md5sums = dc1ec5cf677831dcadd019ce5e88516c
-	md5sums = 743d03f22dcf357112590adbfc120306
-	md5sums = 54e5726b228dde3b1593d357607861c3
-	md5sums = 911d014c0670d3bf7cbc622f00206339
-	md5sums = 83a60fef4c5f69b2ed91605db490a955
+	source = http://cernbox.cern.ch/cernbox/doc/Linux/repo/openSUSE_Leap_42.3/x86_64/cernbox-client-2.3.3-1119.1.x86_64.rpm
+	source = http://cernbox.cern.ch/cernbox/doc/Linux/repo/openSUSE_Leap_42.3/x86_64/libcernboxsync0-2.3.3-1119.1.x86_64.rpm
+	md5sums = 7ab398b3684c7f353b90325da7d67fa9
+	md5sums = 6e2c98c67893c370aeb94572b5094a2a
 
 pkgname = cernbox
 
diff --git a/PKGBUILD b/PKGBUILD
index 2732f29a2511..54cf04a34b56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,33 @@
 # Maintainer: Johannes Lange (<firstname>DOT<lastname>ATcern.ch>)
 pkgname=cernbox
-pkgver=2.1.1_1.1
-pkgrel=2
+pkgver=2.3.3_1119.1
+pkgrel=1
 pkgdesc="Synchronization client for CERN's CERNBox cloud service (based on ownCloud). Note: CERN IT does not provide official support for Arch Linux. Use at your own risk."
 arch=('x86_64')
 url="http://cernbox.web.cern.ch/"
 license=('GPL')
-depends=('neon' 'qt5-webkit')
+depends=('neon' 'qt5-webkit' 'qtkeychain')
 provides=('ocsync' 'cernboxsync')
 
-_repo='http://cernbox.cern.ch/cernbox/doc/Linux/repo/openSUSE_13.2/x86_64/'
+_repo='http://cernbox.cern.ch/cernbox/doc/Linux/repo/openSUSE_Leap_42.3/x86_64/'
 source=(
     ${_repo}cernbox-client-${pkgver/_/-}.x86_64.rpm
     ${_repo}libcernboxsync0-${pkgver/_/-}.x86_64.rpm
-    ${_repo}libqt5keychain0-0.5-3.1.x86_64.rpm
-    cernbox
-    cernboxcmd
 )
 md5sums=(
-    'dc1ec5cf677831dcadd019ce5e88516c'
-    '743d03f22dcf357112590adbfc120306'
-    '54e5726b228dde3b1593d357607861c3'
-    '911d014c0670d3bf7cbc622f00206339'
-    '83a60fef4c5f69b2ed91605db490a955'
+    '7ab398b3684c7f353b90325da7d67fa9'
+    '6e2c98c67893c370aeb94572b5094a2a'
 )
 
 package() {
-    cp -dpr "${srcdir}/usr" "${pkgdir}"
-    cp -dpr "${srcdir}/etc" "${pkgdir}"
+    mkdir -p "${pkgdir}/usr"
+    cp -dpr "${srcdir}/usr/share" "${pkgdir}/usr/"
+    cp -r "${srcdir}/opt/ownCloud/cernbox/bin" "${pkgdir}/usr/"
+    cp -r "${srcdir}/opt/ownCloud/cernbox/lib64" "${pkgdir}/usr/lib"
+    mv "${pkgdir}/usr/lib/cernbox/"*.so* "${pkgdir}/usr/lib/"
+    rm -r "${pkgdir}/usr/lib/cernbox"
     mkdir -p "${pkgdir}/usr/share/pixmaps"
     cp "${pkgdir}/usr/share/icons/hicolor/128x128/apps/cernbox.png" "${pkgdir}/usr/share/pixmaps"
-    if [ "$CARCH" = "x86_64" ]; then
-        mv "${pkgdir}/usr/lib64" "${pkgdir}/usr/lib"
-    fi
-    mv "${pkgdir}/usr/bin/cernbox" "${pkgdir}/usr/lib/cernbox/"
-    mv "${pkgdir}/usr/bin/cernboxcmd" "${pkgdir}/usr/lib/cernbox/"
-    mv "${pkgdir}/usr/lib/libqt5keychain.so.0" "${pkgdir}/usr/lib/cernbox/"
-    mv "${pkgdir}/usr/lib/libqt5keychain.so.0.5.0" "${pkgdir}/usr/lib/cernbox/"
-    # wrapper scripts
-    cp -p "${srcdir}/cernbox" "${pkgdir}/usr/bin"
-    cp -p "${srcdir}/cernboxcmd" "${pkgdir}/usr/bin"
-    chmod 755 "${pkgdir}/usr/bin/cernbox"
-    chmod 755 "${pkgdir}/usr/bin/cernboxcmd"
+
+    cp -dpr "${srcdir}/etc" "${pkgdir}"
 }
diff --git a/cernbox b/cernbox
deleted file mode 100755
index 6334269ae119..000000000000
--- a/cernbox
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/bash
-
-LD_LIBRARY_PATH=/usr/lib/cernbox/:$LD_LIBRARY_PATH /usr/lib/cernbox/cernbox $@
diff --git a/cernboxcmd b/cernboxcmd
deleted file mode 100755
index ed33c7035efc..000000000000
--- a/cernboxcmd
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/bash
-
-LD_LIBRARY_PATH=/usr/lib/cernbox/:$LD_LIBRARY_PATH /usr/lib/cernbox/cernboxcmd $@