main/owncloud: add music app. Small APKBUILD improvements

2 files changed, 40 insertions, 14 deletions

diff --git a/main/owncloud/APKBUILD b/main/owncloud/APKBUILD
index 50f25b74f9..052135f777 100644
--- a/main/owncloud/APKBUILD
+++ b/main/owncloud/APKBUILD
@@ -1,12 +1,15 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname="owncloud"
 pkgver="8.0.2"
-pkgrel=1
-_contactsver="8.0.2"
-_calendarver="8.0.2"
-_tasksver="0.5"
-_documentsver="8.0.2"
+pkgrel=2
+_contactsver="$pkgver"
+_calendarver="$pkgver"
+_tasksver="0.6"
+_documentsver="$pkgver"
+_pdfviewerver="$pkgver"
+_texteditorver="$pkgver"
 _mozillasyncver="1.4"
+_musicver="0.3.5"
 pkgdesc="Your own WebDAV-based cloud service"
 url="http://owncloud.org"
 arch="noarch"
@@ -18,20 +21,25 @@ makedepends="$depends_dev"
 install=
 subpackages="$pkgname-pgsql $pkgname-sqlite $pkgname-mysql $pkgname-encryption
 	$pkgname-calendar $pkgname-contacts $pkgname-documents $pkgname-external
-	$pkgname-mozilla_sync $pkgname-ldap $pkgname-tasks
+	$pkgname-mozilla_sync $pkgname-music $pkgname-ldap $pkgname-tasks
 	$pkgname-texteditor $pkgname-pdfviewer $pkgname-videoviewer"
 replaces="$pkgname-plugins"
-source="http://download.owncloud.org/community/$pkgname-$pkgver.tar.bz2
+
+source="https://download.owncloud.org/community/$pkgname-$pkgver.tar.bz2
 	$pkgname-contacts-$_contactsver.tar.gz::https://github.com/owncloud/contacts/archive/v$_contactsver.tar.gz
 	$pkgname-calendar-$_calendarver.tar.gz::https://github.com/owncloud/calendar/archive/v$_calendarver.tar.gz
 	$pkgname-documents-$_documentsver.tar.gz::https://github.com/owncloud/documents/archive/v$_documentsver.tar.gz
+	$pkgname-texteditor.tar.gz::https://github.com/owncloud/files_texteditor/archive/v$_texteditorver.tar.gz
 	$pkgname-mozilla_sync-$_mozillasyncver.tar.gz::https://github.com/owncloud/mozilla_sync/archive/v$_mozillasyncver.tar.gz
+	$pkgname-music-$_musicver.zip::https://github.com/owncloud/music/releases/download/v$_musicver/music.zip
+	$pkgname-pdfviewer-$_pdfviewerver.tar.gz::https://github.com/owncloud/files_pdfviewer/archive/v$_pdfviewerver.tar.gz
 	$pkgname-tasks-$_tasksver.tar.gz::https://github.com/owncloud/tasks/releases/download/v$_tasksver/tasks.tar.gz
 	owncloud.config.php
 	owncloud-6-always-return-true-isSetLocaleWorking.patch
 	"
 pkggroups="www-data"
 
+#_builddir="$srcdir"/core-$pkgver
 _builddir="$srcdir"/$pkgname
 
 _ocbasedir="/var/lib/owncloud"
@@ -159,6 +167,15 @@ mozilla_sync() {
 	_mv_app src mozilla_sync-$_mozillasyncver
 }
 
+music() {
+	arch="noarch"
+        pkgdesc="ownCloud music app"
+	depends="owncloud"
+	_mv_app src music
+	# Correct world-writable directories
+	find "${subpkgdir}${_ocappsdir}" -type d -exec chmod 775 {} \;
+}
+
 pdfviewer() {
 	arch="noarch"
         pkgdesc="ownCloud integrated PDF viewer"
@@ -191,23 +208,32 @@ md5sums="9b10eb45b7923fcb46b89cf0ad149097  owncloud-8.0.2.tar.bz2
 6b1f334c9620780ca18fc6fd865a519d  owncloud-contacts-8.0.2.tar.gz
 5f47c217963ba2892d0aafe38c79c6e1  owncloud-calendar-8.0.2.tar.gz
 a58e36187be4f81fd11866dead33a8a9  owncloud-documents-8.0.2.tar.gz
+de0787438cfd32de7a141eb27caa9f58  owncloud-texteditor.tar.gz
 e98fdb10ff4139b4259e2a183a88975a  owncloud-mozilla_sync-1.4.tar.gz
-0e19ac2cd0a17ad7824a54f614a04206  owncloud-tasks-0.5.tar.gz
-5374a893d97f4cf456760f0a88a9d673  owncloud.config.php
+7e12f595a2f367b2c3fb117747a340d3  owncloud-music-0.3.5.zip
+65e1d552c0b9749c2a0c25c4eaeb9461  owncloud-pdfviewer-8.0.2.tar.gz
+ce1cac0448434a83f678b1a95c92a648  owncloud-tasks-0.6.tar.gz
+7d29c52fb9cea2537b56a534a8385f19  owncloud.config.php
 f497dbf3a67d14fc9049ca680673c805  owncloud-6-always-return-true-isSetLocaleWorking.patch"
 sha256sums="46c73b6ae3841e856d139537d21e1c7029c64d79fd7c45c794e27cb1469d7f01  owncloud-8.0.2.tar.bz2
 13c22558e95cc709797407fcab970ca605d15b8343a4a9fc711ad717e9749e39  owncloud-contacts-8.0.2.tar.gz
 d587f395e79651b858e1469fe5591f0b9db9847f6f3b511249178de6b1a60010  owncloud-calendar-8.0.2.tar.gz
 91f542c4598d7763c67aba80802e7d1071a86f3395cb6a88430ec94db421f7c3  owncloud-documents-8.0.2.tar.gz
+ec09780974c9c4df187f63e8d5aaf2505a02aff1ec9acf2b4f159787e75e77de  owncloud-texteditor.tar.gz
 314621c290daee93429d881e78d8cae13faaca3205b23860f06450633c5c3b6a  owncloud-mozilla_sync-1.4.tar.gz
-f397637276e5fb189a7ca12b26933460c1a98dcd56f503bdec65b2ccf48ac6aa  owncloud-tasks-0.5.tar.gz
-06bebe03164b98a69a1b138cc99d1227d50db7a2b4f1e5830631e0db58b2542b  owncloud.config.php
+dee4ded5b525097961e7f93e92404a4d1844a7d645a2e5847a4dc0354affb208  owncloud-music-0.3.5.zip
+a91f351dafc1f12ed5378954f0eaa4b4820bba2939b2da053fa0af5adc104af8  owncloud-pdfviewer-8.0.2.tar.gz
+1e60df52c816ceb5e748e3231e95a22f96561df2ac0d6565819779ffff51accf  owncloud-tasks-0.6.tar.gz
+7ec1e79c6dc8c154d9b7d4c6477a659be55798091f3e9d6c07fd3fcc16332692  owncloud.config.php
 3466ffbd22d4a9f04f4df862f3fb2f695fd1ca4bc6fb4b6a56258958064d5762  owncloud-6-always-return-true-isSetLocaleWorking.patch"
 sha512sums="780a9e3c2d8b62dab83681716b830cdc660621f0316b2c87a1f9472b72e8e69b4a48e29a344d4c7ed9d2dc6244b84806cfa9cd1a878669b51256cc8da40ee8a0  owncloud-8.0.2.tar.bz2
 5785eaf382f222b987519036c60af072c82197991ce6496daa2bb734ebc3a4f3ea1696ba0f0c4e0beb0814096bfc57e4618ce8ffe1026af845544e318a9ed798  owncloud-contacts-8.0.2.tar.gz
 1b661372da73b8cab62e2097a94caf40015bab147e15f270bc33baf7cfe080f2634b7bb20d0568159ab3ac04615e4f74f66da2b81b996ccfcdba9c59f53cf121  owncloud-calendar-8.0.2.tar.gz
 4fe3c8a12975c6967f5ab9cdd9a15ed86550ed266a6f89c0d08d92b62e450ca306e5712d2e15b4a76d17b518ae953dcd2d3f3590a3fec05c7d3cc3a4e4b11f0b  owncloud-documents-8.0.2.tar.gz
+b8fbc8aadb07ad7e2d9b86c81e72f2113b88b363a510d40ede3798f4e5eaa86ccf2a8bfa0a54a124cbdada748c9dbafcce99685d79c38d92e00223866f7eb5b0  owncloud-texteditor.tar.gz
 a279a6e0109aa3b17442265358284583d846f88afa3746005792b93dffbd3396dc1277ce892b2a226496038ec6e8ec7ef2295b981ef8acf1a3fa3c32886623d0  owncloud-mozilla_sync-1.4.tar.gz
-15c7c9e09584bba1885549a85810702566867a425075f39a02a8cad26937d2ea9056b563916d910cfadb8cac3345d7eaa92cebaf25440c8641218cd1f23a4fb3  owncloud-tasks-0.5.tar.gz
-3e82a1dea53a33f84ab6986b18e5750a4fdef9bbc0c6e78788e9234f61374f6b135f3bcdd3ad14705f68f5779fce6d992632067023a648c5d7d5a247412a0696  owncloud.config.php
+125e13c00ed92ce94bde5208cf72f13dda5361059736aad332da00021813d61801d380543de85e54142e81b7344df1d6f959e8f918b2938b448a5f1e608aaa16  owncloud-music-0.3.5.zip
+1065f28815ea79102cc41ef44269e2ee181aa0caf3b804aa679b75d1e016e81df8d07419cbff43333dbab7cd4a27686db7f6ae9f755d68a2e8211faa0286da6e  owncloud-pdfviewer-8.0.2.tar.gz
+79285efc95ec330b8d46d0360d70956b1c6c888c1da77c72377fb9ad9fa80f4410cdb09f7a611dc0887db09d8f7006c6525d41bdfe6515958a63a38fd4181f71  owncloud-tasks-0.6.tar.gz
+a1142059f860ee1245ee2e324f206e1ab509ee6fcbd9020f793be557117ac5f6a8ba0e7a1677250df8662c19460e88b6ca2a24b40c14007d18535ab5110280e6  owncloud.config.php
 4b2038786571c62129d748bb71262a7cbc966cf4b97482f13bcedaa36fcfa343080a464fc74463a9bd6615c99a10cd590b91cacead62632db36bfd8940173d13  owncloud-6-always-return-true-isSetLocaleWorking.patch"
diff --git a/main/owncloud/owncloud.config.php b/main/owncloud/owncloud.config.php
index f21ecd6592..adf006d0de 100644
--- a/main/owncloud/owncloud.config.php
+++ b/main/owncloud/owncloud.config.php
@@ -15,7 +15,7 @@ $CONFIG = array(
     ),
     */
   ),
-  'version' => '8.0.0',
+  'version' => '8.0.2',
   'dbname' => 'owncloud',
   'dbhost' => 'localhost',
   'dbuser' => 'owncloud',