fix source URL and clean up

3 files changed, 7 insertions, 120 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4cb9ec5f3472..cc05032379ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
 pkgbase = owncloud-app-mail
 	pkgdesc = An email app for ownCloud
 	pkgver = 0.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/owncloud/mail
 	arch = any
 	license = AGPL
 	depends = owncloud
 	options = !strip
-	source = https://github.com/owncloud/mail/archive/v0.2.1.tar.gz
-	source = autoload.php
-	sha512sums = 38049f3a0b64851849eff54be7ee4eb6e363424495a054b6063f4cf34fa8ea5dda11b341367fe2248e653306ea49df095828d6f90ea7726e752182df6c94edfb
-	sha512sums = 78f210d657042a9249e7297d871348d035a03e833dda617d4a04b15fe26782d9876f462a61d28272c2f15f088e750eab3d1d1992606967207f0eb980db70e2fa
+	source = owncloud-app-mail-0.2.1.tar.gz::https://github.com/owncloud/mail/releases/download/v0.2.1/mail.tar.gz
+	md5sums = 23d93d7a06f0c9eb6cb8c08b5bb24823
 
 pkgname = owncloud-app-mail
 
diff --git a/PKGBUILD b/PKGBUILD
index c43fe57b1959..f99c1ad17a29 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,42 +3,17 @@
 
 pkgname=owncloud-app-mail
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An email app for ownCloud"
 arch=('any')
 url="https://github.com/owncloud/mail"
 license=('AGPL')
 depends=('owncloud')
-#	'pear-net-idna2'
-#	'php-horde-core'
-#	'php-horde-crypt-blowfish'
-#	'php-horde-exception'
-#	'php-horde-text-filter'
-#	'php-horde-text-flowed'
-#	'php-horde-idna'
-#	'php-horde-imap-client'
-#	'php-horde-listheaders'
-#	'php-horde-mail'
-#	'php-horde-mime'
-#	'php-horde-nls'
-#	'php-horde-secret'
-#	'php-horde-smtp'
-#	'php-horde-socket-client'
-#	'php-horde-stream'
-#	'php-horde-stream-filter'
-#	'php-horde-stream-wrapper'
-#	'php-horde-support'
-#	'php-horde-translation'
-#	'php-horde-util'
-#	'php-htmlpurifier')
 options=('!strip')
-source=("https://github.com/owncloud/mail/archive/v${pkgver}.tar.gz"
-	"autoload.php")
-sha512sums=("38049f3a0b64851849eff54be7ee4eb6e363424495a054b6063f4cf34fa8ea5dda11b341367fe2248e653306ea49df095828d6f90ea7726e752182df6c94edfb"
-	    "78f210d657042a9249e7297d871348d035a03e833dda617d4a04b15fe26782d9876f462a61d28272c2f15f088e750eab3d1d1992606967207f0eb980db70e2fa")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/owncloud/mail/releases/download/v$pkgver/mail.tar.gz")
+md5sums=('23d93d7a06f0c9eb6cb8c08b5bb24823')
 
 package() {
   install -d "${pkgdir}/usr/share/webapps/owncloud/apps"
-  cp -a "${srcdir}/mail-${pkgver}" "${pkgdir}/usr/share/webapps/owncloud/apps/mail"
-  #install -Dm0644 $srcdir/autoload.php "${pkgdir}/usr/share/webapps/owncloud/apps/mail/vendor/autoload.php"
+  cp -a "${srcdir}/mail" "${pkgdir}/usr/share/webapps/owncloud/apps/mail"
 }
diff --git a/autoload.php b/autoload.php
deleted file mode 100755
index 9ae43af36e62..000000000000
--- a/autoload.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-require 'Net/IDNA2.php';
-
-require 'Horde/Translation/Handler.php';
-require 'Horde/Translation.php';
-require 'Horde/Imap/Client/Ids/Map.php';
-require 'Horde/Imap/Client/Base/Mailbox.php';
-require 'Horde/Imap/Client/Base.php';
-require 'Horde/Imap/Client/Base/Alerts.php';
-require 'Horde/Exception.php';
-require 'Horde/Exception/Wrapped.php';
-require 'Horde/Translation/Autodetect.php';
-require 'Horde/Imap/Client/Translation.php';
-require 'Horde/Imap/Client/Exception.php';
-require 'Horde/Imap/Client/Exception/ServerResponse.php';
-require 'Horde/Mail/Rfc822/Object.php';
-require 'Horde/Idna.php';
-require 'Horde/Support/Randomid.php';
-require 'Horde/Mime/Part.php';
-require 'Horde/Mail/Rfc822.php';
-require 'Horde/Mail/Rfc822/Address.php';
-require 'Horde/Mail/Rfc822/List.php';
-require 'Horde/Support/CaseInsensitiveArray.php';
-require 'Horde/Mime/Headers/Element.php';
-require 'Horde/Mime.php';
-require 'Horde/Mime/Headers/Element/Single.php';
-require 'Horde/Mime/Headers/Element/Address.php';
-require 'Horde/Mime/Headers/Element/Multiple.php';
-require 'Horde/Mime/Headers/AddressesMulti.php';
-require 'Horde/Mime/Headers/Addresses.php';
-require 'Horde/Mime/Headers/ContentDescription.php';
-require 'Horde/Mime/Headers/ContentParam.php';
-require 'Horde/Mime/Headers/Date.php';
-require 'Horde/Mime/Headers/Identification.php';
-require 'Horde/Mime/Headers/MessageId.php';
-require 'Horde/Mime/Headers/MimeVersion.php';
-require 'Horde/Mime/Headers/Received.php';
-require 'Horde/Mime/Headers/Subject.php';
-require 'Horde/Mime/Headers/UserAgent.php';
-require 'Horde/Util.php';
-require 'Horde/String.php';
-require 'Horde/Mime/Headers.php';
-require 'Horde/Imap/Client/Data/Envelope.php';
-require 'Horde/Imap/Client/Socket.php';
-require 'Horde/Imap/Client.php';
-require 'Horde/Support/Stub.php';
-require 'Horde/Socket/Client/Exception.php';
-require 'Horde/Socket/Client.php';
-require 'Horde/Stream.php';
-require 'Horde/Stream/Temp.php';
-require 'Horde/Imap/Client/Tokenize.php';
-require 'Horde/Imap/Client/Interaction/Server.php';
-require 'Horde/Imap/Client/Interaction/Pipeline.php';
-require 'Horde/Imap/Client/DateTime.php';
-require 'Horde/Imap/Client/Data/Fetch.php';
-require 'Horde/Imap/Client/Fetch/Results.php';
-require 'Horde/Imap/Client/Socket/Connection/Base.php';
-require 'Horde/Imap/Client/Socket/Connection/Socket.php';
-require 'Horde/Imap/Client/Interaction/Server/Untagged.php';
-require 'Horde/Imap/Client/Data/Capability.php';
-require 'Horde/Imap/Client/Data/Format.php';
-require 'Horde/Imap/Client/Data/Format/Atom.php';
-require 'Horde/Imap/Client/Data/Capability/Imap.php';
-require 'Horde/Imap/Client/Data/Format/List.php';
-require 'Horde/Imap/Client/Interaction/Command.php';
-require 'Horde/Imap/Client/Interaction/Command/Continuation.php';
-require 'Horde/Imap/Client/Interaction/Server/Tagged.php';
-require 'Horde/Smtp/Connection.php';
-require 'Horde/Smtp.php';
-require 'Horde/Mail/Transport.php';
-require 'Horde/Mail/Transport/Smtphorde.php';
-require 'Horde/Imap/Client/Mailbox.php';
-require 'Horde/Imap/Client/Utf7imap.php';
-require 'Horde/Imap/Client/Data/Format/String.php';
-require 'Horde/Imap/Client/Data/Format/Astring.php';
-require 'Horde/Imap/Client/Data/Format/Mailbox.php';
-require 'Horde/Imap/Client/Data/Format/ListMailbox.php';
-require 'Horde/Imap/Client/Mailbox/List.php';
-require 'Horde/Imap/Client/Fetch/Query.php';
-require 'Horde/Imap/Client/Ids.php';
-require 'Horde/Imap/Client/Data/Format/Filter/String.php';
-require 'Horde/Imap/Client/Data/Format/Filter/Quote.php';
-
-require 'HTMLPurifier.auto.php';
-
-?>