Split build() and package() stages, correct docs path

2 files changed, 24 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37993872ab57..f7aaa7ed76ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-agate-excel
 	pkgdesc = Adds read support for Excel files (xls and xlsx) to agate
 	pkgver = 0.2.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://agate-excel.readthedocs.org/
 	arch = any
 	license = MIT
@@ -9,10 +9,10 @@ pkgbase = python-agate-excel
 	makedepends = python-sphinx>=1.2.2
 	depends = python
 	depends = python-agate>=1.5.0
-	depends = python-xlrd>=0.9.4
 	depends = python-openpyxl>=2.3.0
 	depends = python-sphinx_rtd_theme>=0.1.6
-	source = https://github.com/wireservice/agate-excel/archive/0.2.3.tar.gz
+	depends = python-xlrd>=0.9.4
+	source = agate-excel-0.2.3.tar.gz::https://github.com/wireservice/agate-excel/archive/0.2.3.tar.gz
 	sha256sums = 83fc1e68b94704b7dae5f0880cb66facec43ecda08d5eafda3c0f2c27587cf53
 
 pkgname = python-agate-excel
diff --git a/PKGBUILD b/PKGBUILD
index 992166ce88a7..a131bb895316 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,46 @@
 # Maintainer: Gabriel Magno <gabrielmagno1@gmail.com>
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
 # Contributor: Michał Pałubicki <maln0ir@gmx.com>
 
 _pkgname=agate-excel
 pkgname=python-$_pkgname
 pkgver=0.2.3
-pkgrel=1
-pkgdesc="Adds read support for Excel files (xls and xlsx) to agate"
+pkgrel=2
+pkgdesc='Adds read support for Excel files (xls and xlsx) to agate'
 arch=('any')
-url="http://agate-excel.readthedocs.org/"
+url='http://agate-excel.readthedocs.org/'
 license=('MIT')
 depends=(
     'python'
     'python-agate>=1.5.0'
-    'python-xlrd>=0.9.4'
     'python-openpyxl>=2.3.0'
     'python-sphinx_rtd_theme>=0.1.6'
+    'python-xlrd>=0.9.4'
   )
 makedepends=(
     'python-setuptools'
     'python-sphinx>=1.2.2'
   )
-source=(
-    "https://github.com/wireservice/agate-excel/archive/${pkgver}.tar.gz"
-  )
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/wireservice/agate-excel/archive/${pkgver}.tar.gz")
 sha256sums=('83fc1e68b94704b7dae5f0880cb66facec43ecda08d5eafda3c0f2c27587cf53')
 
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  python setup.py install --root="$pkgdir/" --optimize=1
-
-  python setup.py build_sphinx
-  mkdir -p "$pkgdir/usr/share/doc"
-  cp -rv "$srcdir/$_pkgname-$pkgver/build/sphinx/html" "$pkgdir/usr/share/doc/$_pkgname"
-
-  _rtd_theme_path="$(python -c 'import sphinx_rtd_theme; print(sphinx_rtd_theme.get_html_theme_path())')"
-  rm -rvf "$pkgdir/usr/share/doc/$_pkgname/_static"
-  ln -svf "$_rtd_theme_path/sphinx_rtd_theme/static" "$pkgdir/usr/share/doc/$_pkgname/_static"
+build() {
+    cd "$_pkgname-$pkgver"
+    python setup.py build
+    python setup.py build_sphinx
+    _rtd_theme_path="$(python -c 'import sphinx_rtd_theme; print(sphinx_rtd_theme.get_html_theme_path())')"
+    rm -rvf "build/sphinx/html/_static"
+    ln -svf "$_rtd_theme_path/sphinx_rtd_theme/static" "build/sphinx/html/_static"
 }
 
 check() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  python setup.py test --test-suite=tests
+    cd "$_pkgname-$pkgver"
+    python setup.py test --test-suite=tests
 }
 
-# vim:set ts=2 sw=2 et:
+package() {
+    cd "$_pkgname-$pkgver"
+    python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+    mkdir -p "$pkgdir/usr/share/doc"
+    cp -rv "build/sphinx/html" "$pkgdir/usr/share/doc/$pkgname"
+}