Better python2 patching.

3 files changed, 8 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a8d6a004266..65c28011da0f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 # Generated by mksrcinfo v8
-# Fri Sep 15 08:07:15 UTC 2017
+# Sat Sep 30 15:34:37 UTC 2017
 pkgbase = duply
 	pkgdesc = A shell front end for duplicity. It manages backup job settings in profiles and allows to batch execute commands.
 	pkgver = 2.0.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://duply.net/
 	arch = any
 	license = GPL2
 	makedepends = txt2man
 	depends = duplicity
-	source = duply_python2.patch
 	source = http://downloads.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/duply_2.0.3.tgz
-	md5sums = adcc36b695e44387747ecc70f0a35b72
 	md5sums = 3d68604a87103ee6ff1bfd029c0e1627
 
 pkgname = duply
diff --git a/PKGBUILD b/PKGBUILD
index 41ea9f4af461..0e7806a46c27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,20 @@
 pkgname=duply
 _mainver=2.0
 pkgver=$_mainver.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A shell front end for duplicity. It manages backup job settings in profiles and allows to batch execute commands."
 arch=('any')
 url="http://duply.net/"
 license=('GPL2')
 depends=('duplicity')
 makedepends=('txt2man')
-source=( "duply_python2.patch"
-         "http://downloads.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/${_mainver}.x/${pkgname}_${pkgver}.tgz")
+source=( "http://downloads.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/${_mainver}.x/${pkgname}_${pkgver}.tgz")
+md5sums=('3d68604a87103ee6ff1bfd029c0e1627')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}_${pkgver}"
-  patch -p1 < "${srcdir}/duply_python2.patch"
+  sed -i $'s|^DEFAULT_PYTHON=\'python\'$|DEFAULT_PYTHON=\'python2\'|' duply
+  sed -i 's|^#PYTHON="python"$|#PYTHON="python2"|' duply
 }
 
 package() {
@@ -26,5 +27,3 @@ package() {
 
 }
 
-md5sums=('adcc36b695e44387747ecc70f0a35b72'
-         '3d68604a87103ee6ff1bfd029c0e1627')
diff --git a/duply_python2.patch b/duply_python2.patch
deleted file mode 100644
index 5036f756d638..000000000000
--- a/duply_python2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./duply.old
-+++ ./duply
-@@ -367,6 +367,10 @@
- 
-   $(using_info)
- END
-+}
-+
-+function python {
-+  python2 "$@"
- }
- 
- function using_info {