+ Provide dia, a program for drawing structured diagrams.

var/spack/repos/builtin/packages/dia/package.py

@@ -0,0 +1,34 @@
+from spack import *
+
+class Dia(Package):
+    """Dia is a program for drawing structured diagrams."""
+    homepage  = 'https://wiki.gnome.org/Apps/Dia'
+    url       = 'https://ftp.gnome.org/pub/gnome/sources/dia/0.97/dia-0.97.3.tar.xz'
+
+    version('0.97.3',    '0e744a0f6a6c4cb6a089e4d955392c3c')
+
+    depends_on('gtkplus@2.6.0:')
+    depends_on('cairo')
+    #depends_on('libart') # optional dependency, not yet supported by spack.
+    depends_on('libpng')
+    depends_on('libxslt')
+    depends_on('python')
+    depends_on('swig')
+    # depends_on('py-gtk') # optional dependency, not yet supported by spack.
+
+    def url_for_version(self, version):
+        """Handle Dia's version-based custom URLs."""
+        return 'https://ftp.gnome.org/pub/gnome/source/dia/%s/dia-%s.tar.xz' % (version.up_to(2), version)
+
+    def install(self, spec, prefix):
+
+        # configure, build, install:
+        options = ['--prefix=%s' % prefix,
+                   '--with-cairo',
+                   '--with-xslt-prefix=%s' % spec['libxslt'].prefix,
+                   '--with-python',
+                   '--with-swig']
+
+        configure(*options)
+        make()
+        make('install')

var/spack/repos/builtin/packages/netlib-lapack/package.py

@@ -34,18 +34,15 @@ class NetlibLapack(Package):
 
     def patch(self):
         # Fix cblas CMakeLists.txt -- has wrong case for subdirectory name.
-        if self.spec.satisfies('@3.6.0:'):
-            filter_file('${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/',
-                        '${CMAKE_CURRENT_SOURCE_DIR}/cmake/', 'CBLAS/CMakeLists.txt', string=True)
+        filter_file('${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/',
+                    '${CMAKE_CURRENT_SOURCE_DIR}/cmake/', 'CBLAS/CMakeLists.txt', string=True)
 
 
     def install_one(self, spec, prefix, shared):
         cmake_args = ['-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if shared else 'OFF'),
+                      '-DCBLAS=ON', # always build CBLAS
                       '-DCMAKE_BUILD_TYPE:STRING=%s' % ('Debug' if '+debug' in spec else 'Release'),
                       '-DLAPACKE:BOOL=%s' % ('ON' if '+lapacke' in spec else 'OFF')]
-        if spec.satisfies('@3.6.0:'):
-            cmake_args.extend(['-DCBLAS=ON']) # always build CBLAS
-
         if '+external-blas' in spec:
             # TODO : the mechanism to specify the library should be more general,
             # TODO : but this allows to have an hook to an external blas
@@ -83,3 +80,6 @@ def setup_dependent_package(self, module, dspec):
         if '+shared' in self.spec:
             self.spec.blas_shared_lib   = join_path(libdir, 'libblas.%s' % dso_suffix)
             self.spec.lapack_shared_lib = join_path(libdir, 'liblapack.%s' % dso_suffix)
+
+
+