summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2015-02-15 12:40:02 -0800
committerTodd Gamblin <tgamblin@llnl.gov>2015-02-15 12:40:02 -0800
commitb11061f99d9e501f69d6d39bae56f0b69d17eaa1 (patch)
tree7d4219884e04e30018bd0dddbcbf8c1929cd1eec /var
parent2f67cdaf10a3e64474f7ac242518fdfe93e9c87a (diff)
downloadspack-b11061f99d9e501f69d6d39bae56f0b69d17eaa1.tar.gz
spack-b11061f99d9e501f69d6d39bae56f0b69d17eaa1.tar.bz2
spack-b11061f99d9e501f69d6d39bae56f0b69d17eaa1.tar.xz
spack-b11061f99d9e501f69d6d39bae56f0b69d17eaa1.zip
Rename py-pyqt4 to py-pyqt.
Diffstat (limited to 'var')
-rw-r--r--var/spack/packages/py-pyqt/package.py5
-rw-r--r--var/spack/packages/qt/package.py6
2 files changed, 7 insertions, 4 deletions
diff --git a/var/spack/packages/py-pyqt/package.py b/var/spack/packages/py-pyqt/package.py
index cb40af351a..8edca105bb 100644
--- a/var/spack/packages/py-pyqt/package.py
+++ b/var/spack/packages/py-pyqt/package.py
@@ -10,9 +10,12 @@ class PyPyqt(Package):
version('4.11.3', '997c3e443165a89a559e0d96b061bf70')
extends('python')
- depends_on('qt@4') # TODO: allow qt5 when conditional deps are supported.
depends_on('py-sip')
+ # TODO: allow qt5 when conditional deps are supported.
+ # TODO: Fix version matching so that @4 works like @:4
+ depends_on('qt@:4')
+
def install(self, spec, prefix):
python('configure.py',
'--confirm-license',
diff --git a/var/spack/packages/qt/package.py b/var/spack/packages/qt/package.py
index fcbcd2491a..3b5096c4f0 100644
--- a/var/spack/packages/qt/package.py
+++ b/var/spack/packages/qt/package.py
@@ -43,9 +43,9 @@ class Qt(Package):
'-fast',
'-optimized-qmake',
'-no-pch',
-# phonon required for py-pyqt4
-# '-no-phonon',
-# '-no-phonon-backend',
+ # phonon required for py-pyqt
+ # '-no-phonon',
+ # '-no-phonon-backend',
'-no-openvg')
make()
make("install")