summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/gtk-doc/package.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/gtk-doc/package.py b/var/spack/repos/builtin/packages/gtk-doc/package.py
index 1cb992b3a5..5cebdafaa6 100644
--- a/var/spack/repos/builtin/packages/gtk-doc/package.py
+++ b/var/spack/repos/builtin/packages/gtk-doc/package.py
@@ -15,8 +15,9 @@ class GtkDoc(AutotoolsPackage):
pdf/man-pages with some extra work."""
homepage = "https://wiki.gnome.org/DocumentationProject/GtkDoc"
- url = 'https://gitlab.gnome.org/GNOME/gtk-doc/-/archive/GTK_DOC_1_32/gtk-doc-GTK_DOC_1_32.tar.gz'
+ url = 'https://gitlab.gnome.org/GNOME/gtk-doc/-/archive/1.33.2/gtk-doc-1.33.2.tar.gz'
+ version('1.33.2', sha256='2d1b0cbd26edfcb54694b2339106a02a81d630a7dedc357461aeb186874cc7c0')
version('1.32', sha256='0890c1f00d4817279be51602e67c4805daf264092adc58f9c04338566e8225ba')
# Commented out until package dblatex has been created
@@ -26,7 +27,7 @@ class GtkDoc(AutotoolsPackage):
depends_on('automake', type='build')
depends_on('libtool', type='build')
depends_on('m4', type='build')
- depends_on('pkgconfig', type='build')
+ depends_on('pkgconfig@0.19:', type='build')
depends_on('python@3.2:', type=('build', 'run'))
depends_on('py-pygments', type=('build', 'run'))
@@ -35,7 +36,7 @@ class GtkDoc(AutotoolsPackage):
depends_on('py-parameterized', type=('test'))
depends_on('py-six', type=('test'))
depends_on('libxslt')
- depends_on('libxml2')
+ depends_on('libxml2@2.3.6:')
depends_on('docbook-xsl@1.78.1')
depends_on('docbook-xml@4.3')
# depends_on('dblatex', when='+pdf')
@@ -57,8 +58,13 @@ class GtkDoc(AutotoolsPackage):
def url_for_version(self, version):
"""Handle gnome's version-based custom URLs."""
- url = 'https://gitlab.gnome.org/GNOME/gtk-doc/-/archive/GTK_DOC_{0}/gtk-doc-GTK_DOC_{0}.tar.gz'
- return url.format(version.underscored)
+
+ if version <= Version('1.32'):
+ url = 'https://gitlab.gnome.org/GNOME/gtk-doc/-/archive/GTK_DOC_{0}/gtk-doc-GTK_DOC_{0}.tar.gz'
+ return url.format(version.underscored)
+
+ url = 'https://gitlab.gnome.org/GNOME/gtk-doc/-/archive/{0}/gtk-doc-{0}.tar.gz'
+ return url.format(version)
def configure_args(self):
args = [