From f9149b6cb63416af2f952c71db8750450f30cbc1 Mon Sep 17 00:00:00 2001
From: Bob Robey <brobey@lanl.gov>
Date: Sat, 25 Oct 2014 21:59:01 -0600
Subject: [PATCH] Fixing errors in depends_on and updating version for
ImageMagick
---
var/spack/packages/ImageMagick/package.py | 16 ++++++++--------
var/spack/packages/automake/package.py | 2 +-
var/spack/packages/libtiff/package.py | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/var/spack/packages/ImageMagick/package.py b/var/spack/packages/ImageMagick/package.py
index fc1ee56bbd..39c733e0df 100644
--- a/var/spack/packages/ImageMagick/package.py
+++ b/var/spack/packages/ImageMagick/package.py
@@ -3,16 +3,16 @@
class Imagemagick(Package):
"""ImageMagick is a image processing library"""
homepage = "http://www.imagemagic.org"
- url = "http://www.imagemagick.org/download/ImageMagick-6.8.9-8.tar.gz"
+ url = "http://www.imagemagick.org/download/ImageMagick-6.8.9-9.tar.gz"
- version('6.8.9-8', '74aa203286bfb8aaadd320f787eea64e')
+ version('6.8.9-9', 'e63fed3e3550851328352c708f800676')
- depends_on(libtool)
- depends_on(jpeg)
- depends_on(libpng)
- depends_on(freetype)
- depends_on(fontconfig)
- depends_on(libtiff)
+ depends_on('libtool')
+ depends_on('jpeg')
+ depends_on('libpng')
+ depends_on('freetype')
+ depends_on('fontconfig')
+# depends_on('libtiff')
def install(self, spec, prefix):
configure("--prefix=%s" % prefix)
diff --git a/var/spack/packages/automake/package.py b/var/spack/packages/automake/package.py
index 73c01afdd6..9115822730 100644
--- a/var/spack/packages/automake/package.py
+++ b/var/spack/packages/automake/package.py
@@ -7,7 +7,7 @@ class Automake(Package):
version('1.14.1', 'd052a3e884631b9c7892f2efce542d75')
- depends_on(autoconf)
+ depends_on('autoconf')
def install(self, spec, prefix):
configure("--prefix=%s" % prefix)
diff --git a/var/spack/packages/libtiff/package.py b/var/spack/packages/libtiff/package.py
index 0de544ad92..ec54cf7adf 100644
--- a/var/spack/packages/libtiff/package.py
+++ b/var/spack/packages/libtiff/package.py
@@ -1,6 +1,6 @@
from spack import *
-class libtiff(Package):
+class Libtiff(Package):
"""libtiff graphics format library"""
homepage = "http://www.remotesensing.org/libtiff/"
url = "http://download.osgeo.org/libtiff/tiff-4.0.3.tar.gz"
--
GitLab