1.11.0-1

3 files changed, 81 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3dcc3fbffdf..6f4db891a65a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,34 @@
 pkgbase = python-flask-apscheduler
 	pkgdesc = Adds APScheduler support to Flask
-	pkgver = 1.6.0
+	pkgver = 1.11.0
 	pkgrel = 1
 	url = https://github.com/viniciuschiele/flask-apscheduler
 	arch = any
 	license = Apache
-	makedepends = python2-setuptools
+	makedepends = python
+	makedepends = python2
 	makedepends = python-setuptools
-	makedepends = python2-flask
-	makedepends = python-flask
-	makedepends = python2-apscheduler
+	makedepends = python2-setuptools
 	makedepends = python-apscheduler
-	source = https://github.com/viniciuschiele/flask-apscheduler/releases/download/1.6.0/Flask-APScheduler-1.6.0.tar.gz
-	md5sums = 7129d36d64f688ba5f55aee310e15fd8
-
-pkgname = python2-flask-apscheduler
-	depends = python2-flask
-	depends = python2-apscheduler
+	makedepends = python2-apscheduler
+	makedepends = python-dateutil
+	makedepends = python2-dateutil
+	makedepends = python-flask
+	makedepends = python2-flask
+	source = https://github.com/viniciuschiele/flask-apscheduler/releases/download/1.11.0/Flask-APScheduler-1.11.0.tar.gz
+	source = 0001-Don-t-install-LICENSE-file.patch
+	sha256sums = 7911d66e449f412d92a1a6c524217f44f4c40a5c92148c60d5189c6c402f87d0
+	sha256sums = 353a85fdcc9d8eee32fb7990155974eb30c8c79fe851a2fa6de700aaf59d8fb7
 
 pkgname = python-flask-apscheduler
-	depends = python-flask
+	depends = python
 	depends = python-apscheduler
+	depends = python-dateutil
+	depends = python-flask
+
+pkgname = python2-flask-apscheduler
+	depends = python2
+	depends = python2-apscheduler
+	depends = python2-dateutil
+	depends = python2-flask
 
diff --git a/0001-Don-t-install-LICENSE-file.patch b/0001-Don-t-install-LICENSE-file.patch
new file mode 100644
index 000000000000..5486e5046d0e
--- /dev/null
+++ b/0001-Don-t-install-LICENSE-file.patch
@@ -0,0 +1,24 @@
+From 99d74f0eccadbbb0a98da89e2b0014f5d552a9e2 Mon Sep 17 00:00:00 2001
+From: 0x9fff00 <0x9fff00+git@protonmail.ch>
+Date: Sat, 9 Nov 2019 14:11:44 +0100
+Subject: [PATCH] Don't install LICENSE file
+
+---
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index dc70bd8..cd76433 100644
+--- a/setup.py
++++ b/setup.py
+@@ -11,7 +11,6 @@ setup(
+     description='Adds APScheduler support to Flask',
+     keywords=['apscheduler', 'scheduler', 'scheduling', 'cron'],
+     install_requires=['flask>=0.10.1', 'apscheduler>=3.2.0', 'python-dateutil>=2.4.2'],
+-    data_files=[('', ['LICENSE'])],
+     classifiers=[
+         'Development Status :: 5 - Production/Stable',
+         'Intended Audience :: Developers',
+-- 
+2.24.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 767f6439bc7d..e3edd27b6a82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,51 @@
-# First Linux Arch packager: Serge Victor <arch@random.re>
-# Current Packager: Christoph Stahl <christoph.stahl@uni-dortmund.de>
+# Maintainer: 0x9fff00 <0x9fff00+git@protonmail.ch>
+# Contributor: Christoph Stahl <christoph.stahl@uni-dortmund.de>
+# Contributor: Serge Victor <arch@random.re>
 
 _pipname=Flask-APScheduler
-pkgbase=python-flask-apscheduler
-pkgname=('python2-flask-apscheduler' 'python-flask-apscheduler')
-pkgver=1.6.0
+_pkgname=flask-apscheduler
+pkgbase=python-$_pkgname
+pkgname=("python-$_pkgname" "python2-$_pkgname")
+pkgver=1.11.0
 pkgrel=1
-pkgdesc="Adds APScheduler support to Flask"
+pkgdesc='Adds APScheduler support to Flask'
 arch=('any')
-url="https://github.com/viniciuschiele/flask-apscheduler"
+url="https://github.com/viniciuschiele/$_pkgname"
 license=('Apache')
-makedepends=('python2-setuptools' 'python-setuptools' 'python2-flask' 'python-flask' 'python2-apscheduler' 'python-apscheduler')
-source=("https://github.com/viniciuschiele/flask-apscheduler/releases/download/${pkgver}/${_pipname}-${pkgver}.tar.gz")
+makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools' 'python-apscheduler' 'python2-apscheduler' 'python-dateutil' 'python2-dateutil' 'python-flask' 'python2-flask')
+source=("$url/releases/download/$pkgver/$_pipname-$pkgver.tar.gz"
+        '0001-Don-t-install-LICENSE-file.patch')
+sha256sums=('7911d66e449f412d92a1a6c524217f44f4c40a5c92148c60d5189c6c402f87d0'
+            '353a85fdcc9d8eee32fb7990155974eb30c8c79fe851a2fa6de700aaf59d8fb7')
 
 prepare() {
-    cp -R $_pipname-$pkgver python2-$_pipname-$pkgver
+  cd "$_pipname-$pkgver"
+  for p in "$srcdir"/*.patch; do
+    patch -Np1 -i "$p"
+  done
+  cd ..
+
+  cp -a $_pipname-$pkgver{,-py2}
 }
 
-package_python2-flask-apscheduler() {
-depends=('python2-flask' 'python2-apscheduler')
+build() {
+  cd "$srcdir/$_pipname-$pkgver"
+  python setup.py build
 
-    cd python2-$_pipname-$pkgver
-    python2 setup.py install --root="$pkgdir/" --optimize=1
+  cd "$srcdir/$_pipname-$pkgver-py2"
+  python2 setup.py build
 }
 
 package_python-flask-apscheduler() {
-depends=('python-flask' 'python-apscheduler')
+  depends=('python' 'python-apscheduler' 'python-dateutil' 'python-flask')
 
-    cd $_pipname-$pkgver 
-    python setup.py install --root="$pkgdir/" --optimize=1
+  cd "$_pipname-$pkgver"
+  python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
 }
 
-md5sums=('7129d36d64f688ba5f55aee310e15fd8')
+package_python2-flask-apscheduler() {
+  depends=('python2' 'python2-apscheduler' 'python2-dateutil' 'python2-flask')
+
+  cd "$_pipname-$pkgver-py2"
+  python2 setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+}