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

[Levente Polyak via arch-commits]

Date: Sunday, November 15, 2020 @ 16:37:01
  Author: anthraxx
Revision: 754584

upgpkg: asciidoc 9.0.4-2: Python 3.9 rebuild

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-15 16:36:53 UTC (rev 754583)
+++ PKGBUILD2020-11-15 16:37:01 UTC (rev 754584)
@@ -10,7 +10,7 @@
 
 pkgname=asciidoc
 pkgver=9.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages'
 arch=('any')
 url='https://asciidoc.org/'

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

[Levente Polyak via arch-commits]

Date: Sunday, November 15, 2020 @ 16:31:28
  Author: anthraxx
Revision: 754581

upgpkg: asciidoc 9.0.4-1

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-15 16:27:02 UTC (rev 754580)
+++ PKGBUILD2020-11-15 16:31:28 UTC (rev 754581)
@@ -1,4 +1,5 @@
 # Maintainer: Eli Schwartz 
+# Maintainer: Levente Polyak 
 # Contributor: Florian Pritz 
 # Contributor: Chris Brannon 
 # Contributor: Geoffroy Carrier 
@@ -8,9 +9,9 @@
 # Contributor: Daniel J Griffiths 
 
 pkgname=asciidoc
-pkgver=9.0.3
-pkgrel=3
-pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages.'
+pkgver=9.0.4
+pkgrel=1
+pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages'
 arch=('any')
 url='https://asciidoc.org/'
 license=('GPL')
@@ -24,9 +25,9 @@
 'fop: alternative pdf generation'
 'w3m: text generation'
 'lynx: alternative text generation')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/asciidoc/asciidoc-py3/archive/${pkgver}.tar.gz;)
-sha256sums=('c0de1dcf111a200bf85bd81f67bc18778f839e55d761d6c7320095985524853a')
-b2sums=('4e196bddfe400c3758086048089e3d316a8e7909f870b761e23506de8cd5b9871df8a0e1017fafbaa854711ab0d49efe4f8134453c02528ba8b6e1ac1cf0c0ff')
+source=("https://github.com/asciidoc/asciidoc-py3/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz;)
+sha256sums=('9e269f336a71e8685d03a00c71b55ca029eed9f7baf1afe67c447be32206b176')
+b2sums=('3c073e20e0b4cb1c3e43d45217240675d5a1349c5d27c8e03c4499505c17ad0a149f9495a42e28490f9c89f29dc25a1216e9145a6fd1483e589b5fee49a6279f')
 
 prepare() {
   cd ${pkgname}-py3-${pkgver}

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

[Evangelos Foutras via arch-commits]

Date: Wednesday, November 11, 2020 @ 15:09:21
  Author: foutrelis
Revision: 750915

upgpkg: asciidoc 9.0.3-3: Python 3.9 rebuild

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-11 15:09:18 UTC (rev 750914)
+++ PKGBUILD2020-11-11 15:09:21 UTC (rev 750915)
@@ -9,7 +9,7 @@
 
 pkgname=asciidoc
 pkgver=9.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages.'
 arch=('any')
 url='https://asciidoc.org/'

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

[Felix Yan via arch-commits]

Date: Monday, November 9, 2020 @ 16:51:42
  Author: felixonmars
Revision: 747619

upgpkg: asciidoc 9.0.3-2: Python 3.9 rebuild

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-09 16:51:38 UTC (rev 747618)
+++ PKGBUILD2020-11-09 16:51:42 UTC (rev 747619)
@@ -9,7 +9,7 @@
 
 pkgname=asciidoc
 pkgver=9.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages.'
 arch=('any')
 url='https://asciidoc.org/'

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

[Eli Schwartz via arch-commits]

Date: Sunday, October 18, 2020 @ 18:41:47
  Author: eschwartz
Revision: 726762

upgpkg: asciidoc 9.0.3-1: upstream release

drop some build workarounds now that the new version contains the fixes I 
requested

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-18 17:51:24 UTC (rev 726761)
+++ PKGBUILD2020-10-18 18:41:47 UTC (rev 726762)
@@ -8,7 +8,7 @@
 # Contributor: Daniel J Griffiths 
 
 pkgname=asciidoc
-pkgver=9.0.2
+pkgver=9.0.3
 pkgrel=1
 pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages.'
 arch=('any')
@@ -25,8 +25,8 @@
 'w3m: text generation'
 'lynx: alternative text generation')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/asciidoc/asciidoc-py3/archive/${pkgver}.tar.gz;)
-sha256sums=('ea73425151f56f278433e442f8b5085599765fa120574db65e6d053eb52927e2')
-b2sums=('5f5deca6b8c15d4b86e2bd6fdb131908eecd862a5fdbbd8418937050d335a25ad012a3b1bc716379f5623db676176fc6da1a09691c2b42a213a6230281626b69')
+sha256sums=('c0de1dcf111a200bf85bd81f67bc18778f839e55d761d6c7320095985524853a')
+b2sums=('4e196bddfe400c3758086048089e3d316a8e7909f870b761e23506de8cd5b9871df8a0e1017fafbaa854711ab0d49efe4f8134453c02528ba8b6e1ac1cf0c0ff')
 
 prepare() {
   cd ${pkgname}-py3-${pkgver}
@@ -46,9 +46,7 @@
 check() {
   cd ${pkgname}-py3-${pkgver}
 
-  # this overrides the mocked time in the test
-  # https://github.com/asciidoc/asciidoc-py3/issues/131
-  env -u SOURCE_DATE_EPOCH make test
+  make test
 }
 
 package() {
@@ -57,8 +55,6 @@
   make install DESTDIR="${pkgdir}"
   make docs DESTDIR="${pkgdir}"
 
-  # junk files: https://github.com/asciidoc/asciidoc-py3/issues/133
-  rm -v "${pkgdir}"/usr/share/doc/asciidoc/doc/*.{md5,svg,png}
   install -Dm644 asciidocapi.py \
 "${pkgdir}/$(python -c 'import sysconfig; 
print(sysconfig.get_paths()["platlib"])')"/asciidocapi.py
 }

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

[Eli Schwartz via arch-commits]

Date: Tuesday, July 28, 2020 @ 04:09:21
  Author: eschwartz
Revision: 665608

upgpkg: asciidoc 9.0.2-1

upstream release moves to python3 \o/
adopt package
add testsuite
add new optdepend for graphviz filter, revealed by testsuite

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |   62 +
 1 file changed, 30 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-28 03:44:57 UTC (rev 665607)
+++ PKGBUILD2020-07-28 04:09:21 UTC (rev 665608)
@@ -1,3 +1,5 @@
+# Maintainer: Eli Schwartz 
+# Contributor: Florian Pritz 
 # Contributor: Chris Brannon 
 # Contributor: Geoffroy Carrier 
 # Contributor: Dan McGee 
@@ -4,17 +6,18 @@
 # Contributor: Jaroslaw Rosiek 
 # Contributor: Darwin Bautista 
 # Contributor: Daniel J Griffiths 
-# Maintainer: Florian Pritz 
 
 pkgname=asciidoc
-pkgver=8.6.10
-pkgrel=2
+pkgver=9.0.2
+pkgrel=1
 pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages.'
 arch=('any')
-url='https://www.methods.co.nz/asciidoc/'
+url='https://asciidoc.org/'
 license=('GPL')
-depends=('python2' 'libxslt' 'docbook-xsl')
-optdepends=('lilypond: music-filter'
+depends=('python' 'libxslt' 'docbook-xsl')
+checkdepends=('dblatex' 'graphviz' 'lilypond' 'source-highlight')
+optdepends=('graphviz: graphviz-filter'
+'lilypond: music-filter'
 'imagemagick: music-filter'
 'source-highlight: source-highlight-filter'
 'dblatex: pdf generation'
@@ -21,46 +24,41 @@
 'fop: alternative pdf generation'
 'w3m: text generation'
 'lynx: alternative text generation')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/asciidoc/asciidoc/archive/${pkgver}.tar.gz;)
-md5sums=('4e69960f4d431780e9828f53417d8d7a')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/asciidoc/asciidoc-py3/archive/${pkgver}.tar.gz;)
+sha256sums=('ea73425151f56f278433e442f8b5085599765fa120574db65e6d053eb52927e2')
+b2sums=('5f5deca6b8c15d4b86e2bd6fdb131908eecd862a5fdbbd8418937050d335a25ad012a3b1bc716379f5623db676176fc6da1a09691c2b42a213a6230281626b69')
 
 prepare() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-py3-${pkgver}
 
-  # python2 fix
-  #for file in asciidocapi.py a2x.py asciidoc.py filters/music/music2png.py 
filters/latex/latex2png.py \
- #filters/code/code-filter.py filters/graphviz/graphviz2png.py; do
-   #sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-  #done
-  #sed -i -e 's_sys:python_sys:python2_g' -e 's_sys3:python_sys3:python2_g' 
xhtml11.conf
-  #sed -i 's_sys:python_sys:python2_g' xhtml11-quirks.conf
-  #sed -i -e 's/{python}/{python2}/g' \
- #-e 's#{language@python:py:#{language@python2:py:#' \
- #filters/source/source-highlight-filter.conf \
- #html5.conf xhtml11.conf xhtml11-quirks.conf
-  #sed -i -e "s#'python'#'python2'#g" filters/code/code-filter.py
-  sed -i -e 's#python a2x.py#python2 a2x.py#' Makefile.in
+  autoconf
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-py3-${pkgver}
 
-  autoconf
   ./configure \
 --prefix=/usr \
 --sysconfdir=/etc
+  make manpages
 }
 
+check() {
+  cd ${pkgname}-py3-${pkgver}
+
+  # this overrides the mocked time in the test
+  # https://github.com/asciidoc/asciidoc-py3/issues/131
+  env -u SOURCE_DATE_EPOCH make test
+}
+
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-py3-${pkgver}
 
-  make install DESTDIR=${pkgdir}
-  make docs DESTDIR=${pkgdir}
+  make install DESTDIR="${pkgdir}"
+  make docs DESTDIR="${pkgdir}"
 
+  # junk files: https://github.com/asciidoc/asciidoc-py3/issues/133
+  rm -v "${pkgdir}"/usr/share/doc/asciidoc/doc/*.{md5,svg,png}
   install -Dm644 asciidocapi.py \
-${pkgdir}/usr/lib/python2.7/site-packages/asciidocapi.py
-
-  # fix FS#21579 - [asciidoc] 8.6.2-2 "asciidoc" table style doesn't work 
(mismatched python version)
-  #sed -i 's/python/python2/' \
-#${pkgdir}/etc/asciidoc/asciidoc.conf
+"${pkgdir}/$(python -c 'import sysconfig; 
print(sysconfig.get_paths()["platlib"])')"/asciidocapi.py
 }

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

[Eli Schwartz via arch-commits]

Date: Tuesday, July 28, 2020 @ 00:10:22
  Author: eschwartz
Revision: 665567

asciidoc: clean up optdepends list

the default is w3m, not lynx, and make the descriptions more uniform

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-28 00:10:04 UTC (rev 665566)
+++ PKGBUILD2020-07-28 00:10:22 UTC (rev 665567)
@@ -15,12 +15,12 @@
 license=('GPL')
 depends=('python2' 'libxslt' 'docbook-xsl')
 optdepends=('lilypond: music-filter'
-'imagemagick: music-filter (used in conjunction with lilypond)'
+'imagemagick: music-filter'
 'source-highlight: source-highlight-filter'
 'dblatex: pdf generation'
 'fop: alternative pdf generation'
-'lynx: text generation'
-'w3m: text generation (alternative to lynx)')
+'w3m: text generation'
+'lynx: alternative text generation')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/asciidoc/asciidoc/archive/${pkgver}.tar.gz;)
 md5sums=('4e69960f4d431780e9828f53417d8d7a')
 
@@ -60,7 +60,7 @@
   install -Dm644 asciidocapi.py \
 ${pkgdir}/usr/lib/python2.7/site-packages/asciidocapi.py
 
-  # fix FS#21579 - [asciidoc] 8.6.2-2 "asciidoc" table style doesn't work 
(mismatched python version) 
+  # fix FS#21579 - [asciidoc] 8.6.2-2 "asciidoc" table style doesn't work 
(mismatched python version)
   #sed -i 's/python/python2/' \
 #${pkgdir}/etc/asciidoc/asciidoc.conf
 }

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

[Felix Yan via arch-commits]

Date: Monday, May 25, 2020 @ 13:07:33
  Author: felixonmars
Revision: 634220

upgpkg: asciidoc 8.6.10-2: Buildinfo Format 1 rebuild

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-25 13:07:17 UTC (rev 634219)
+++ PKGBUILD2020-05-25 13:07:33 UTC (rev 634220)
@@ -8,7 +8,7 @@
 
 pkgname=asciidoc
 pkgver=8.6.10
-pkgrel=1
+pkgrel=2
 pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages.'
 arch=('any')
 url='https://www.methods.co.nz/asciidoc/'

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

[Antonio Rojas via arch-commits]

Date: Monday, May 27, 2019 @ 20:32:38
  Author: arojas
Revision: 471997

https

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-27 20:32:12 UTC (rev 471996)
+++ PKGBUILD2019-05-27 20:32:38 UTC (rev 471997)
@@ -11,7 +11,7 @@
 pkgrel=1
 pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages.'
 arch=('any')
-url='http://www.methods.co.nz/asciidoc/'
+url='https://www.methods.co.nz/asciidoc/'
 license=('GPL')
 depends=('python2' 'libxslt' 'docbook-xsl')
 optdepends=('lilypond: music-filter'

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

[Florian Pritz via arch-commits]

Date: Saturday, December 9, 2017 @ 18:54:19
  Author: bluewind
Revision: 273397

upgpkg: asciidoc 8.6.10-1

upstream update

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |   18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-09 17:46:08 UTC (rev 273396)
+++ PKGBUILD2017-12-09 18:54:19 UTC (rev 273397)
@@ -8,8 +8,8 @@
 # Maintainer: Florian Pritz 
 
 pkgname=asciidoc
-pkgver=8.6.9
-pkgrel=3
+pkgver=8.6.10
+pkgrel=1
 pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages.'
 arch=('any')
 url='http://www.methods.co.nz/asciidoc/'
@@ -22,17 +22,17 @@
 'fop: alternative pdf generation'
 'lynx: text generation'
 'w3m: text generation (alternative to lynx)')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('c59018f105be8d022714b826b0be130a')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/asciidoc/asciidoc/archive/${pkgver}.tar.gz;)
+md5sums=('4e69960f4d431780e9828f53417d8d7a')
 
 prepare() {
   cd ${pkgname}-${pkgver}
 
   # python2 fix
-  for file in asciidocapi.py a2x.py asciidoc.py filters/music/music2png.py 
filters/latex/latex2png.py \
- filters/code/code-filter.py filters/graphviz/graphviz2png.py; do
-   sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-  done
+  #for file in asciidocapi.py a2x.py asciidoc.py filters/music/music2png.py 
filters/latex/latex2png.py \
+ #filters/code/code-filter.py filters/graphviz/graphviz2png.py; do
+   #sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+  #done
   #sed -i -e 's_sys:python_sys:python2_g' -e 's_sys3:python_sys3:python2_g' 
xhtml11.conf
   #sed -i 's_sys:python_sys:python2_g' xhtml11-quirks.conf
   #sed -i -e 's/{python}/{python2}/g' \
@@ -40,11 +40,13 @@
  #filters/source/source-highlight-filter.conf \
  #html5.conf xhtml11.conf xhtml11-quirks.conf
   #sed -i -e "s#'python'#'python2'#g" filters/code/code-filter.py
+  sed -i -e 's#python a2x.py#python2 a2x.py#' Makefile.in
 }
 
 build() {
   cd ${pkgname}-${pkgver}
 
+  autoconf
   ./configure \
 --prefix=/usr \
 --sysconfdir=/etc

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

[Florian Pritz]

Date: Thursday, July 14, 2016 @ 15:14:59
  Author: bluewind
Revision: 182903

Fix FS#49770 - [asciidoc] Missing documents and example files

upgpkg: asciidoc 8.6.9-3

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-14 14:57:35 UTC (rev 182902)
+++ PKGBUILD2016-07-14 15:14:59 UTC (rev 182903)
@@ -9,7 +9,7 @@
 
 pkgname=asciidoc
 pkgver=8.6.9
-pkgrel=2
+pkgrel=3
 pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages.'
 arch=('any')
 url='http://www.methods.co.nz/asciidoc/'
@@ -54,6 +54,7 @@
   cd ${pkgname}-${pkgver}
 
   make install DESTDIR=${pkgdir}
+  make docs DESTDIR=${pkgdir}
 
   install -Dm644 asciidocapi.py \
 ${pkgdir}/usr/lib/python2.7/site-packages/asciidocapi.py

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

[Florian Pritz]

Date: Sunday, September 14, 2014 @ 18:00:30
  Author: bluewind
Revision: 118968

upgpkg: asciidoc 8.6.9-2

remove asciidoc.vim - FS#41843

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-14 15:56:24 UTC (rev 118967)
+++ PKGBUILD2014-09-14 16:00:30 UTC (rev 118968)
@@ -9,7 +9,7 @@
 
 pkgname=asciidoc
 pkgver=8.6.9
-pkgrel=1
+pkgrel=2
 pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages.'
 arch=('any')
 url='http://www.methods.co.nz/asciidoc/'
@@ -58,9 +58,6 @@
   install -Dm644 asciidocapi.py \
 ${pkgdir}/usr/lib/python2.7/site-packages/asciidocapi.py
 
-  install -Dm644 vim/syntax/asciidoc.vim \
-${pkgdir}/usr/share/vim/vimfiles/syntax/asciidoc.vim
-
   # fix FS#21579 - [asciidoc] 8.6.2-2 asciidoc table style doesn't work 
(mismatched python version) 
   #sed -i 's/python/python2/' \
 #${pkgdir}/etc/asciidoc/asciidoc.conf

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

[Florian Pritz]

Date: Wednesday, November 13, 2013 @ 18:41:18
  Author: bluewind
Revision: 100944

upgpkg: asciidoc 8.6.9-1

upstream update

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-13 14:18:13 UTC (rev 100943)
+++ PKGBUILD2013-11-13 17:41:18 UTC (rev 100944)
@@ -8,8 +8,8 @@
 # Maintainer: Florian Pritz f...@xinu.at
 
 pkgname=asciidoc
-pkgver=8.6.8
-pkgrel=2
+pkgver=8.6.9
+pkgrel=1
 pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages.'
 arch=('any')
 url='http://www.methods.co.nz/asciidoc/'
@@ -23,7 +23,7 @@
 'lynx: text generation'
 'w3m: text generation (alternative to lynx)')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('61ab211f30481741ce4d1e4b12bf')
+md5sums=('c59018f105be8d022714b826b0be130a')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -61,9 +61,6 @@
   install -Dm644 vim/syntax/asciidoc.vim \
 ${pkgdir}/usr/share/vim/vimfiles/syntax/asciidoc.vim
 
-  install -Dm644 vim/ftdetect/asciidoc_filetype.vim \
-${pkgdir}/usr/share/vim/vimfiles/ftdetect/asciidoc.vim
-
   # fix FS#21579 - [asciidoc] 8.6.2-2 asciidoc table style doesn't work 
(mismatched python version) 
   #sed -i 's/python/python2/' \
 #${pkgdir}/etc/asciidoc/asciidoc.conf

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

[Florian Pritz]

Date: Saturday, May 25, 2013 @ 12:03:46
  Author: bluewind
Revision: 91597

potential fix for FS#21579

upgpkg: asciidoc 8.6.8-2

Modified:
  asciidoc/trunk/PKGBUILD

--+
 PKGBUILD |   25 +
 1 file changed, 17 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-25 09:55:41 UTC (rev 91596)
+++ PKGBUILD2013-05-25 10:03:46 UTC (rev 91597)
@@ -9,7 +9,7 @@
 
 pkgname=asciidoc
 pkgver=8.6.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Text document format for short documents, articles, books and UNIX 
man pages.'
 arch=('any')
 url='http://www.methods.co.nz/asciidoc/'
@@ -25,17 +25,26 @@
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
 md5sums=('61ab211f30481741ce4d1e4b12bf')
 
-build() {
+prepare() {
   cd ${pkgname}-${pkgver}
 
   # python2 fix
   for file in asciidocapi.py a2x.py asciidoc.py filters/music/music2png.py 
filters/latex/latex2png.py \
-  filters/code/code-filter.py filters/graphviz/graphviz2png.py; do
-sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+ filters/code/code-filter.py filters/graphviz/graphviz2png.py; do
+   sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
   done
-  sed -i -e 's_sys:python_sys:python2_g' -e 's_sys3:python_sys3:python2_g' 
xhtml11.conf
-  sed -i 's_sys:python_sys:python2_g' xhtml11-quirks.conf 
+  #sed -i -e 's_sys:python_sys:python2_g' -e 's_sys3:python_sys3:python2_g' 
xhtml11.conf
+  #sed -i 's_sys:python_sys:python2_g' xhtml11-quirks.conf
+  #sed -i -e 's/{python}/{python2}/g' \
+ #-e 's#{language@python:py:#{language@python2:py:#' \
+ #filters/source/source-highlight-filter.conf \
+ #html5.conf xhtml11.conf xhtml11-quirks.conf
+  #sed -i -e s#'python'#'python2'#g filters/code/code-filter.py
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
+
   ./configure \
 --prefix=/usr \
 --sysconfdir=/etc
@@ -56,6 +65,6 @@
 ${pkgdir}/usr/share/vim/vimfiles/ftdetect/asciidoc.vim
 
   # fix FS#21579 - [asciidoc] 8.6.2-2 asciidoc table style doesn't work 
(mismatched python version) 
-  sed -i 's/python/python2/' \
-${pkgdir}/etc/asciidoc/asciidoc.conf
+  #sed -i 's/python/python2/' \
+#${pkgdir}/etc/asciidoc/asciidoc.conf
 }