Removed patch

3 files changed, 6 insertions, 75 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d379555d7fb7..8d662fdfedfc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = modoboa
-	pkgdesc = Modoboa is a django mail hosting and management platform
+	pkgdesc = Mail hosting made simple
 	pkgver = 1.17.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://modoboa.org/en/
 	arch = any
 	license = MIT
@@ -33,8 +33,6 @@ pkgbase = modoboa
 	provides = modoboa
 	conflicts = modoboa-git
 	source = https://files.pythonhosted.org/packages/source/m/modoboa/modoboa-1.17.0.tar.gz
-	source = python2.patch
 	sha512sums = e7fc609605a0a6503a47656bc9ca564c83bc46f44acfc793b01e926053b2b0fa585cedfd9c5bb1f654cf02534e7d006bec66076daf696372fde203f9a9d74e20
-	sha512sums = a70429bd59ccf77384feff700df95facd9f7b674d0378d872233136a6ba5c61acdc6614b35493eecdfc01ae0fede12171aa143e493a45441aa87667e93903cfb
 
 pkgname = modoboa
diff --git a/PKGBUILD b/PKGBUILD
index 268bb34da3da..666bba35e750 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=modoboa
 pkgver=1.17.0
-pkgrel=2
-pkgdesc="Modoboa is a django mail hosting and management platform"
+pkgrel=3
+pkgdesc="Mail hosting made simple"
 arch=(any)
 url="https://modoboa.org/en/"
 license=('MIT')
@@ -15,15 +15,9 @@ depends=('python-django' 'python-dj-database-url' 'python-pip' 'python-requests'
 optdepends=('python-virtualenv' 'mysql' 'postgresql' 'sqlite' 'python-mysql-connector' 'python-psycopg2' 'gunicorn' 'python-vex')
 provides=('modoboa')
 conflicts=('modoboa-git')
-source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'python2.patch')
-sha512sums=('e7fc609605a0a6503a47656bc9ca564c83bc46f44acfc793b01e926053b2b0fa585cedfd9c5bb1f654cf02534e7d006bec66076daf696372fde203f9a9d74e20'
-            'a70429bd59ccf77384feff700df95facd9f7b674d0378d872233136a6ba5c61acdc6614b35493eecdfc01ae0fede12171aa143e493a45441aa87667e93903cfb')
+source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha512sums=('e7fc609605a0a6503a47656bc9ca564c83bc46f44acfc793b01e926053b2b0fa585cedfd9c5bb1f654cf02534e7d006bec66076daf696372fde203f9a9d74e20')
 
-prepare() {
-  cd "$srcdir"
-  patch -p0 -i "$srcdir/python2.patch"
- }
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   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