diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | python2.patch | 77 | ||||
| -rw-r--r-- | shebang.patch | 27 |
4 files changed, 98 insertions, 40 deletions
@@ -1,19 +1,24 @@ pkgbase = modoboa pkgdesc = Modoboa is a django mail hosting and management platform pkgver = 1.3.4 - pkgrel = 2 + pkgrel = 3 url = www.modoboa.org arch = any - license = GPL + license = MIT makedepends = python2 makedepends = python2-rrdtool makedepends = python2-lxml makedepends = python2-setuptools makedepends = zlib - makedepends = python2-django - makedepends = python2-dj-database-url - makedepends = python2-pip - makedepends = python2-requests + 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 optdepends = python2-virtualenv optdepends = mysql optdepends = postgresql @@ -22,10 +27,11 @@ pkgbase = modoboa optdepends = python2-psycopg2 optdepends = python2-aspw optdepends = python2-gunicorn + optdepends = python2-vex provides = modoboa conflicts = modoboa-git source = https://pypi.python.org/packages/source/m/modoboa/modoboa-1.3.4.tar.gz - source = shebang.patch + source = python2.patch sha512sums = 9aecea8e0c8282292ba1cc11749956967ceb66332157267338bf08a05ffdc13bfeae64968cffb3df955ee7d73ad25a9370e639c363fe6de4167044de40413e6b sha512sums = bffd4074211a6468eef8a1e374786af196b27f1140fdc90d77eb2fde626178b0f91aecc7d42c2baaf9e50570bd81b4fa8f724e8e2dd05e5fa70db238e8e77de1 @@ -1,24 +1,26 @@ # Maintainer: raininja <daniel.mclellan@gmail.com + pkgname=modoboa pkgver=1.3.4 -pkgrel=2 +pkgrel=3 pkgdesc="Modoboa is a django mail hosting and management platform" arch=(any) url="www.modoboa.org" -license=('GPL') -makedepends=('python2' 'python2-rrdtool' 'python2-lxml' 'python2-setuptools' 'zlib' 'python2-django' 'python2-dj-database-url' - 'python2-pip' 'python2-requests' 'python2-crypto' 'python2-sievelib' 'python2-chardet' 'python2-argparse' 'python2-django-reversion') +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') optdepends=('python2-virtualenv' 'mysql' 'postgresql' 'sqlite' 'python2-mysql-connector' 'python2-psycopg2' 'python2-aspw' 'python2-gunicorn' 'python2-vex') provides=('modoboa') conflicts=('modoboa-git') source=("https://pypi.python.org/packages/source/m/$pkgname/$pkgname-$pkgver.tar.gz" - 'shebang.patch') + 'python2.patch') sha512sums=('9aecea8e0c8282292ba1cc11749956967ceb66332157267338bf08a05ffdc13bfeae64968cffb3df955ee7d73ad25a9370e639c363fe6de4167044de40413e6b' 'bffd4074211a6468eef8a1e374786af196b27f1140fdc90d77eb2fde626178b0f91aecc7d42c2baaf9e50570bd81b4fa8f724e8e2dd05e5fa70db238e8e77de1') prepare() { cd "$srcdir" - patch -p0 -i "$srcdir/shebang.patch" + patch -p0 -i "$srcdir/python2.patch" } package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/python2.patch b/python2.patch new file mode 100644 index 000000000000..16c1a664dbe9 --- /dev/null +++ b/python2.patch @@ -0,0 +1,77 @@ +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/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 18:59:50.938033043 -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/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:02:35.615025612 -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/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 diff --git a/shebang.patch b/shebang.patch deleted file mode 100644 index 2f45939293da..000000000000 --- a/shebang.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 18:59:50.938033043 -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/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:02:35.615025612 -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/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 |