python-log: Backport changes from [community]

2 files changed, 18 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 40c36089d9ef..3178ec25ff89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
-# Generated by mksrcinfo v8
-# Thu Aug 10 20:56:59 UTC 2017
 pkgbase = python-colorlog
 	pkgdesc = Log formatting with colors
 	pkgver = 3.1.0
-	pkgrel = 0
+	pkgrel = 3
 	url = https://github.com/borntyping/python-colorlog
 	arch = any
 	license = MIT
+	makedepends = python-setuptools
+	makedepends = python2-setuptools
 	source = https://github.com/borntyping/python-colorlog/archive/v3.1.0.tar.gz
 	sha256sums = e766265cf249947f1690d5d7f4fe566a2d48a86640f6777374671aa05f6214b8
 
@@ -17,4 +17,3 @@ pkgname = python-colorlog
 pkgname = python2-colorlog
 	depends = python2
 	conflicts = python2-colorlog-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 9fb8df025c98..91cee3cbd615 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,32 @@
-# Maintainer: mdraw.gh at gmail dot com
+# Maintainer: Pierre Neidhardt <ambrevar@gmail.com>
+# Contributor: mdraw.gh at gmail dot com
 
 pkgbase='python-colorlog'
 pkgname=('python-colorlog' 'python2-colorlog')
 pkgver='3.1.0'
-pkgrel=0
+pkgrel=3
 pkgdesc="Log formatting with colors"
 arch=('any')
 url='https://github.com/borntyping/python-colorlog'
 license=('MIT')
-source=("https://github.com/borntyping/python-colorlog/archive/v${pkgver}.tar.gz")
+makedepends=('python-setuptools' 'python2-setuptools')
+source=("https://github.com/borntyping/python-colorlog/archive/v$pkgver.tar.gz")
 sha256sums=('e766265cf249947f1690d5d7f4fe566a2d48a86640f6777374671aa05f6214b8')
 
 package_python-colorlog() {
-    depends=('python')
-    makedepends=('python-setuptools')
-    conflicts=('python-colorlog-git')
+	depends=('python')
+	conflicts=('python-colorlog-git')
 
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    python setup.py install --root="${pkgdir}" --optimize=1
+	cd "$srcdir/$pkgbase-$pkgver"
+	python setup.py install --root="$pkgdir" --prefix=/usr --optimize=1
+	install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/python-colorlog/LICENSE"
 }
 
 package_python2-colorlog() {
-    depends=('python2')
-    makedepends=('python2-setuptools')
-    conflicts=('python2-colorlog-git')
+	depends=('python2')
+	conflicts=('python2-colorlog-git')
 
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    python2 setup.py install --root="${pkgdir}" --optimize=1
+	cd "$srcdir/$pkgbase-$pkgver"
+	python2 setup.py install --root="$pkgdir" --prefix=/usr --optimize=1
+	install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/python2-colorlog/LICENSE"
 }