diff options
| -rw-r--r-- | .SRCINFO | 88 | ||||
| -rw-r--r-- | PKGBUILD | 37 | ||||
| -rw-r--r-- | python2.patch | 61 |
3 files changed, 73 insertions, 113 deletions
@@ -1,43 +1,67 @@ pkgbase = modoboa - pkgdesc = Modoboa is a django mail hosting and management platform - pkgver = 1.3.4 - pkgrel = 3 - url = https://modoboa.org/en/ + pkgdesc = Mail hosting made simple + pkgver = 2.2.4 + pkgrel = 1 + url = https://modoboa.org/ arch = any license = MIT - makedepends = python2 - makedepends = python2-rrdtool - makedepends = python2-lxml - makedepends = python2-setuptools + makedepends = python>=3.8 + makedepends = rrdtool + makedepends = python-lxml + makedepends = python-setuptools makedepends = zlib - depends = python2-django - depends = python2-dj-database-url - depends = python2-pip - depends = python2-requests - depends = python2-crypto - depends = python2-sievelib - depends = python2-chardet - depends = python2-argparse - depends = python2-django-reversion - depends = python2-passlib - depends = python2-django-versionfield2 - depends = python2-factory_boy - depends = python2-django-xforwardedfor-middleware - optdepends = python2-virtualenv + makedepends = python-wheel + makedepends = python-dj-database-url + makedepends = python-pip + makedepends = python-requests + makedepends = python-pycryptodome + makedepends = python-bcrypt + makedepends = python-asgiref + makedepends = python-chardet + makedepends = python-django-reversion>=5.0 + makedepends = python-django-rest-framework>=3.13 + makedepends = python-dnspython + makedepends = python-redis + makedepends = python-passlib + makedepends = python-uritemplate + makedepends = python-feedparser + makedepends = python-django-jsonfield + makedepends = python-django-xforwardedfor-middleware + makedepends = python-django-filter + makedepends = python-greenlet + makedepends = python-gevent + makedepends = python-qrcode + makedepends = python-progressbar + makedepends = python-dateutil + makedepends = python-cryptography + makedepends = python-pytz + makedepends = python-chardet + makedepends = python-ovh + makedepends = python-oath + depends = python>=3.8 + depends = python-django + depends = python-dj-database-url + depends = python-pip + depends = python-requests + depends = python-pycryptodome + depends = python-chardet + depends = python-django-reversion>=5.0 + depends = python-passlib + depends = python-django-xforwardedfor-middleware + optdepends = python-virtualenv optdepends = mysql optdepends = postgresql optdepends = sqlite - optdepends = python2-mysql-connector - optdepends = python2-psycopg2 - optdepends = python2-aspw - optdepends = python2-gunicorn - optdepends = python2-vex + optdepends = python-mysql-connector + optdepends = python-django-otp + optdepends = python-psycopg2 + optdepends = gunicorn + optdepends = python-vex + optdepends = python-pillow + optdepends = python-factory-boy provides = modoboa conflicts = modoboa-git - source = https://files.pythonhosted.org/packages/source/m/modoboa/modoboa-1.3.4.tar.gz - source = python2.patch - sha512sums = 9aecea8e0c8282292ba1cc11749956967ceb66332157267338bf08a05ffdc13bfeae64968cffb3df955ee7d73ad25a9370e639c363fe6de4167044de40413e6b - sha512sums = a70429bd59ccf77384feff700df95facd9f7b674d0378d872233136a6ba5c61acdc6614b35493eecdfc01ae0fede12171aa143e493a45441aa87667e93903cfb + source = https://files.pythonhosted.org/packages/source/m/modoboa/modoboa-2.2.4.tar.gz + sha512sums = fd444da4f3b6f011f19a6e83001f65f38aa7f0e6eca17d03511cfdade787d33ab7b4c69e0dbf6f867feae932032f1b815819dfb083109705b0ee7225d2bbd918 pkgname = modoboa - @@ -1,31 +1,28 @@ # Maintainer: raininja <daniel.mclellan@gmail.com pkgname=modoboa -pkgver=1.3.4 -pkgrel=3 -pkgdesc="Modoboa is a django mail hosting and management platform" +pkgver=2.2.4 +pkgrel=1 +pkgdesc="Mail hosting made simple" arch=(any) -url="https://modoboa.org/en/" +url="https://modoboa.org/" license=('MIT') -makedepends=('python2' 'python2-rrdtool' 'python2-lxml' 'python2-setuptools' 'zlib') -depends=( 'python2-django' 'python2-dj-database-url' 'python2-pip' 'python2-requests' 'python2-crypto' - 'python2-sievelib' 'python2-chardet' 'python2-argparse' 'python2-django-reversion' - 'python2-passlib' 'python2-django-versionfield2' 'python2-factory_boy' - 'python2-django-xforwardedfor-middleware') -optdepends=('python2-virtualenv' 'mysql' 'postgresql' 'sqlite' 'python2-mysql-connector' 'python2-psycopg2' 'python2-aspw' - 'python2-gunicorn' 'python2-vex') +makedepends=('python>=3.8' 'rrdtool' 'python-lxml' 'python-setuptools' 'zlib' 'python-wheel' + 'python-dj-database-url' 'python-pip' 'python-requests' 'python-pycryptodome' 'python-bcrypt' 'python-asgiref' + 'python-chardet' 'python-django-reversion>=5.0' 'python-django-rest-framework>=3.13' 'python-dnspython' 'python-redis' + 'python-passlib' 'python-uritemplate' 'python-feedparser' 'python-django-jsonfield' + 'python-django-xforwardedfor-middleware' 'python-django-filter' 'python-greenlet' 'python-gevent' 'python-qrcode' + 'python-progressbar' 'python-dateutil' 'python-cryptography' 'python-pytz' 'python-chardet' 'python-ovh' 'python-oath') +depends=('python>=3.8' 'python-django' 'python-dj-database-url' 'python-pip' 'python-requests' 'python-pycryptodome' 'python-chardet' + 'python-django-reversion>=5.0' 'python-passlib' 'python-django-xforwardedfor-middleware') +optdepends=('python-virtualenv' 'mysql' 'postgresql' 'sqlite' 'python-mysql-connector' 'python-django-otp' + 'python-psycopg2' 'gunicorn' 'python-vex' 'python-pillow' 'python-factory-boy') provides=('modoboa') conflicts=('modoboa-git') -source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'python2.patch') -sha512sums=('9aecea8e0c8282292ba1cc11749956967ceb66332157267338bf08a05ffdc13bfeae64968cffb3df955ee7d73ad25a9370e639c363fe6de4167044de40413e6b' - 'a70429bd59ccf77384feff700df95facd9f7b674d0378d872233136a6ba5c61acdc6614b35493eecdfc01ae0fede12171aa143e493a45441aa87667e93903cfb') +source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha512sums=('fd444da4f3b6f011f19a6e83001f65f38aa7f0e6eca17d03511cfdade787d33ab7b4c69e0dbf6f867feae932032f1b815819dfb083109705b0ee7225d2bbd918') -prepare() { - cd "$srcdir" - patch -p0 -i "$srcdir/python2.patch" - } package() { cd "$srcdir/$pkgname-$pkgver" - python2 setup.py install --root="$pkgdir/" --optimize=1 + python setup.py install --root="$pkgdir/" --optimize=1 } diff --git a/python2.patch b/python2.patch deleted file mode 100644 index 42fb319e1bd0..000000000000 --- a/python2.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -Naur modoboa-1.3.4-pristine/modoboa/core/commands/deploy.py modoboa-1.3.4/modoboa/core/commands/deploy.py ---- modoboa-1.3.4-pristine/modoboa/core/commands/deploy.py 2015-08-23 18:56:55.498040960 -0400 -+++ modoboa-1.3.4/modoboa/core/commands/deploy.py 2015-08-24 10:05:57.381579767 -0400 -@@ -89,7 +89,7 @@ - :param name: the command name - :param cwd: the directory where the command must be executed - """ -- cmd = 'python manage.py %s %s' % (name, " ".join(args)) -+ cmd = 'python2 manage.py %s %s' % (name, " ".join(args)) - if not self._verbose: - p = subprocess.Popen( - cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, -diff -Naur modoboa-1.3.4-pristine/modoboa/lib/templatetags/lib_tags.py modoboa-1.3.4/modoboa/lib/templatetags/lib_tags.py ---- modoboa-1.3.4-pristine/modoboa/lib/templatetags/lib_tags.py 2015-08-23 18:56:55.545040958 -0400 -+++ modoboa-1.3.4/modoboa/lib/templatetags/lib_tags.py 2015-08-24 01:27:59.939982131 -0400 -@@ -1,3 +1,4 @@ -+#!/usr/bin/env python2 - # coding: utf-8 - from datetime import datetime - -diff -Naur modoboa-1.3.4-pristine/modoboa/lib/test_utils.py modoboa-1.3.4/modoboa/lib/test_utils.py ---- modoboa-1.3.4-pristine/modoboa/lib/test_utils.py 2015-08-23 18:56:55.545040958 -0400 -+++ modoboa-1.3.4/modoboa/lib/test_utils.py 2015-08-24 10:05:57.381579767 -0400 -@@ -41,7 +41,7 @@ - self.assertEqual(code, 0) - - path = os.path.join(self.workdir, self.projname) -- cmd = "python manage.py test {0}.tests".format(self.extension) -+ cmd = "python2 manage.py test {0}.tests".format(self.extension) - code, output = exec_cmd(cmd, capture_output=False, cwd=path) - self.assertEqual(code, 0) - -diff -Naur modoboa-1.3.4-pristine/modoboa/lib/u2u_decode.py modoboa-1.3.4/modoboa/lib/u2u_decode.py ---- modoboa-1.3.4-pristine/modoboa/lib/u2u_decode.py 2015-08-23 18:56:55.545040958 -0400 -+++ modoboa-1.3.4/modoboa/lib/u2u_decode.py 2015-08-23 19:15:50.482989744 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # coding: utf-8 - """ - u2u_decode.py -diff -Naur modoboa-1.3.4-pristine/bin/modoboa-admin.py modoboa-1.3.4/bin/modoboa-admin.py ---- modoboa-1.3.4-pristine/bin/modoboa-admin.py 2015-08-23 18:56:55.496040960 -0400 -+++ modoboa-1.3.4/bin/modoboa-admin.py 2015-08-23 19:15:50.481989744 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # coding: utf-8 - - from modoboa.core.commands import handle_command_line - - -diff -Naur modoboa-1.3.4-pristine/setup.py modoboa-1.3.4/setup.py ---- modoboa-1.3.4-pristine/setup.py 2015-08-23 18:56:55.549040958 -0400 -+++ modoboa-1.3.4/setup.py 2015-08-23 18:58:52.709035671 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # vim: tabstop=4 shiftwidth=4 softtabstop=4 - - import os |