Python 3 for all extensions.

2 files changed, 8 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00c50916b608..2c585e9fddeb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,16 @@
-# Generated by mksrcinfo v8
-# Fri Dec 14 03:23:08 UTC 2018
 pkgbase = folder-color-bzr
 	pkgdesc = Folder color switcher extension for nautilus, caja, and nemo
-	pkgver = 0.0.86.r281
-	pkgrel = 3
+	pkgver = 0.0.88.r290
+	pkgrel = 1
 	url = http://foldercolor.tuxfamily.org/
 	arch = any
 	license = GPL3
 	makedepends = bzr
 	makedepends = python-distutils-extra
-	makedepends = python2-distutils-extra
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
 	optdepends = python-nautilus: Nautilus extension
 	optdepends = nemo-python>=3.9.0: Nemo extension
-	optdepends = python2-caja: Caja extension
+	optdepends = python-caja: Caja extension
 	conflicts = folder-color-nautilus-bzr
 	source = folder-color::bzr+http://bazaar.launchpad.net/~costales/folder-color/trunk
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 37d897d0d4d5..a8e27e1e9cfe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,16 @@
 
 _pkgname=folder-color
 pkgname=${_pkgname}-bzr
-pkgver=0.0.86.r281
-pkgrel=3
+pkgver=0.0.88.r290
+pkgrel=1
 pkgdesc="Folder color switcher extension for nautilus, caja, and nemo"
 arch=('any')
 url="http://foldercolor.tuxfamily.org/"
 license=('GPL3')
-makedepends=('bzr' python{,2}-distutils-extra python{,2}-setuptools)
+makedepends=('bzr' 'python-distutils-extra' 'python-setuptools')
 optdepends=('python-nautilus:    Nautilus extension'
             'nemo-python>=3.9.0: Nemo extension'
-            'python2-caja:       Caja extension')
+            'python-caja:        Caja extension')
 conflicts=('folder-color-nautilus-bzr')
 source=("${_pkgname}"::bzr+http://bazaar.launchpad.net/~costales/folder-color/trunk)
 sha256sums=('SKIP')
@@ -27,27 +27,15 @@ prepare() {
 		cp -r "${_pkgname}" "${_pkgname}-${_fm}"
 		pushd "${_pkgname}-${_fm}"/install_scripts
 		./${_fm}.sh
-		case "${_fm}" in 
-			# patch nemo and nautilus extensions for python3
-			nautilus|nemo)
-				sed -i 's:urllib.unquote:urllib.parse.unquote:g' ../${_fm}-extension/folder-color.py ;;
-		esac
 		popd
 	done
 }
 
 package() {
-	for _fm in nautilus nemo common ; do
+	for _fm in nautilus caja nemo common ; do
 		pushd "${_pkgname}-${_fm}/"
 		python ./setup.py install --root="$pkgdir"
 		popd
 	done
-
-	for _fm in caja common ; do
-		pushd "${_pkgname}-${_fm}/"
-		python2 ./setup.py install --root="$pkgdir"
-		popd
-	done
-
 }