[arch-commits] Commit in asciidoc/trunk (PKGBUILD)

[Caleb Maclennan]

    Date: Saturday, February 19, 2022 @ 09:15:41
  Author: alerque
Revision: 1134838

upgpkg: asciidoc 10.1.2-2; fix borked directories

Modified:
  asciidoc/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-19 09:12:42 UTC (rev 1134837)
+++ PKGBUILD	2022-02-19 09:15:41 UTC (rev 1134838)
@@ -11,7 +11,7 @@
 
 pkgname=asciidoc
 pkgver=10.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Text document format for short documents, articles, books and UNIX man pages'
 arch=('any')
 url='https://asciidoc.org/'
@@ -27,23 +27,22 @@
             'fop: alternative pdf generation'
             'w3m: text generation'
             'lynx: alternative text generation')
-source=("https://github.com/asciidoc-py/asciidoc-py/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-# https://github.com/asciidoc-py/asciidoc-py/issues/234
-# source=("https://github.com/asciidoc-py/asciidoc-py/releases/download/$pkgver/$pkgname-$pkgver.tar.gz")
+source=("https://github.com/asciidoc-py/asciidoc-py/releases/download/$pkgver/$pkgname-$pkgver.tar.gz")
 sha256sums=('0bfcebf4d0419323c8b4903676b05259847e6534c82a2629a0c852e621de7c47')
 b2sums=('a00ade1a849ffed98d10ddbbca5300e6f9fca9fc60663ff6e59979613a013b408829d35d9362cdf830ef08cd494ca4a47dab919ce29ce7111ee0fdaa3e301f24')
 
 prepare() {
   cd ${pkgname}-py-${pkgver}
+  # https://github.com/asciidoc-py/asciidoc-py/issues/234
   autoconf
-  # https://github.com/asciidoc-py/asciidoc-py/issues/201
-  sed -i -e '/pip install/s/\.$/--root $(DESTDIR) ./' Makefile.in
 }
 
 build() {
   cd ${pkgname}-py-${pkgver}
+  # https://github.com/asciidoc-py/asciidoc-py/issues/234#issuecomment-1045970138
   ./configure \
-    --prefix=/usr
+      --docdir /usr/share/doc/$pkgname \
+      --prefix /usr
   make build
   make manpages
 }
@@ -55,10 +54,12 @@
 
 package() {
   cd ${pkgname}-py-${pkgver}
-  make install DESTDIR="${pkgdir}"
-  make docs DESTDIR="${pkgdir}"
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" docs
   install -Dm0644 -t "$pkgdir/usr/share/man/man1/" doc/*.1
   # ascidocapi is deprecated, but still included in 10.x on a "provisional" basis
   local _platlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["platlib"])')"
   install -Dm0644 -t "${pkgdir}/${_platlib}/${pkgname}/" asciidoc/api.py
+  # https://github.com/asciidoc-py/asciidoc-py/issues/241
+  rm -rf "${pkgdir}/${_platlib}/tests"
 }