From 5578c07b51b98437644c2558036b4eb2becf6e3a Mon Sep 17 00:00:00 2001
From: Olivier Cessenat <cessenat@gmail.com>
Date: Fri, 26 Feb 2021 17:04:36 +0100
Subject: asciidoc: sourceforge a2x needs python2, adds more recent for py3
(#21807)
* asciidoc: current sourceforge a2x needs python2, new github release python3
* asciidoc: current sourceforge a2x needs python2, new github release python3
* asciidoc: making python 2.3 to 2.7 able to cope with asciidoc
* asciidoc: current sourceforge a2x needs python2, new github release python3
* asciidoc: current sourceforge a2x needs python2, new github release python3
* asciidoc: current sourceforge a2x needs python2, new github release python3
* asciidoc: current sourceforge a2x needs python2, new github release python3
---
.../repos/builtin/packages/asciidoc/package.py | 34 ++++++++++++++++++----
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/var/spack/repos/builtin/packages/asciidoc/package.py b/var/spack/repos/builtin/packages/asciidoc/package.py
index a3dac6a826..4c5ddd2ba0 100644
--- a/var/spack/repos/builtin/packages/asciidoc/package.py
+++ b/var/spack/repos/builtin/packages/asciidoc/package.py
@@ -11,11 +11,33 @@ class Asciidoc(AutotoolsPackage):
pages and other small to medium sized documents."""
homepage = "http://asciidoc.org"
- url = "http://downloads.sourceforge.net/project/asciidoc/asciidoc/8.6.9/asciidoc-8.6.9.tar.gz"
+ # Always working URL but strangely with another checksum
+ url = "https://github.com/asciidoc-py/asciidoc-py/archive/8.6.10.tar.gz"
+ git = "https://github.com/asciidoc-py/asciidoc-py.git"
- version('8.6.9', sha256='78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0')
+ version('master', branch='master')
+ version('9.1.0', sha256='5056c20157349f8dc74f005b6e88ccbf1078c4e26068876f13ca3d1d7d045fe7')
+ version('9.0.5', sha256='edc8328c3682a8568172656f6fc309b189f65219a49517966c7ea144cb25f8b2')
+ version('9.0.4', sha256='fb0e683ae6a4baf34a8969c3af764ca729526196576729ee9275b9f39fd8b79c')
+ version('9.0.3', sha256='b6ef4accd7959f51b532ab4d3aaa211e15f18fd544c4c3cc3ed712f5590a50de')
+ version('9.0.2', sha256='93fbe32d56380afee2f26389d8ebfdf33de72536449d53308120d3c20d2c1e17')
+ version('8.6.10', sha256='22d6793d4f48cefb4a6963853212a214591a591ece1bcbc56af3c67c642003ea')
+ version('8.6.9', sha256='45e95bed1e341980f7de0a66fdc467090956fe55d4625bdad8057cd926e0c6c6')
- depends_on('libxml2')
- depends_on('libxslt')
- depends_on('docbook-xml')
- depends_on('docbook-xsl')
+ depends_on('libxml2', type=('build', 'run'))
+ depends_on('libxslt', type=('build', 'run'))
+ depends_on('docbook-xml', type=('build', 'run'))
+ depends_on('docbook-xsl', type=('build', 'run'))
+ depends_on('python@2.3.0:2.7.99', when='@:8.6.9', type=('build', 'run'))
+ depends_on('python@3.5:', when='@9.0.2:', type=('build', 'run'))
+
+ @when('@:8.6.9')
+ def install(self, spec, prefix):
+ # Old release demands python2
+ mpythpath = spec['python'].command.path
+ exes = ['asciidoc', 'a2x']
+ for exe in exes:
+ fthfile = FileFilter(exe + '.py')
+ fthfile.filter('#!/usr/bin/env python', '#!' + mpythpath)
+
+ make('install')
--
cgit v1.2.3-70-g09d2