conflicts

2 files changed, 4 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35d3162d968b..fdcac1727eec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Oct 12 16:29:51 UTC 2016
+# Wed Oct 12 16:31:38 UTC 2016
 pkgbase = python-pyscaffold
 	pkgdesc = Python project template generator with batteries included
 	pkgver = 2.5.7
diff --git a/PKGBUILD b/PKGBUILD
index a0ffc67f9c10..80495fea5d7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,6 +25,7 @@ package_python-pyscaffold() {
 
   cd "${srcdir}/pyscaffold-$pkgver"
   python setup.py install --root=${pkgdir}
+  rm -r ${pkgdir}/usr/share/pyscaffold/docs
 }
 
 package_python2-pyscaffold() {
@@ -32,5 +33,7 @@ package_python2-pyscaffold() {
 
   cd "${srcdir}/pyscaffold-$pkgver"
   python2 setup.py install --root=${pkgdir}
+  rm -r ${pkgdir}/usr/share/pyscaffold/docs
+  mv ${pkgdir}/usr/bin/putup ${pkgdir}/usr/bin/putup2
 }