votca-*: remove rc versions (#16197)

5 files changed, 6 insertions, 20 deletions

diff --git a/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py b/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py
index 50d770efa4..bba3ad0b48 100644
--- a/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py
+++ b/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py
@@ -21,14 +21,11 @@ class VotcaCsgTutorials(CMakePackage):
 
     version('master', branch='master')
     version('1.6', sha256='54946c647724f1beb95942d47ec7f4cf7a95a59ec7268522693d5ec723585daf')
-    version('1.6_rc2', sha256='3c82e6fe03c7d5226f37b787eee23eb629901734d19b93ef9eb519660ff5223c')
-    version('1.6_rc1', sha256='87c4d945d2bdcb247e985cd407b0767c441f7810f1237ae65a63617f136e2ac9')
     version('1.5.1',   sha256='e35cea92df0e7d05ca7b449c1b5d84d887a3a23c7796abe3b84e4d6feec7faca')
     version('1.5',     sha256='03b841fb94129cf59781a7a5e3b71936c414aa9dfa17a50d7bc856d46274580c')
     version('1.4.1',   sha256='623724192c3a7d76b603a74a3326f181045f10f38b9f56dce754a90f1a74556e')
     version('1.4',     sha256='27d50acd68a9d8557fef18ec2b0c62841ae91c22275ab9afbd65c35e4dd5f719')
 
-    for v in ["1.4", "1.4.1", "1.5", "1.5.1", "1.6_rc1", "1.6_rc2", "1.6",
-              "master"]:
+    for v in ["1.4", "1.4.1", "1.5", "1.5.1", "1.6", "master"]:
         depends_on('votca-csg@%s' % v, when="@%s:%s.0" % (v, v))
     depends_on("boost")
diff --git a/var/spack/repos/builtin/packages/votca-csg/package.py b/var/spack/repos/builtin/packages/votca-csg/package.py
index a1ac086ce9..0f0432d702 100644
--- a/var/spack/repos/builtin/packages/votca-csg/package.py
+++ b/var/spack/repos/builtin/packages/votca-csg/package.py
@@ -21,16 +21,13 @@ class VotcaCsg(CMakePackage):
 
     version('master', branch='master')
     version('1.6', sha256='8cf6a4ac3ef7347c720a44d8a676f8cbd1462e162f6113de39f27b89354465ea')
-    version('1.6_rc2', sha256='32d19c7f8e30baece35462b6f8ae06bf0d7be038f875be38dc49da5798209236')
-    version('1.6_rc1', sha256='163701a65a34f90e8a850370167a82cbebf2b5c0774b7a8ad07884451fe9e332')
     version('1.5.1', sha256='7fca1261bd267bf38d2edd26259730fed3126c0c3fd91fb81940dbe17bb568fd')
     version('1.5', sha256='160387cdc51f87dd20ff2e2eed97086beee415d48f3c92f4199f6109068c8ff4')
     version('1.4.1', sha256='41dccaecadd0165c011bec36a113629e27745a5a133d1a042efe4356acdb5450')
     version('1.4', sha256='c13e7febd792de8c3d426203f089bd4d33b8067f9db5e8840e4579c88b61146e')
 
     depends_on("cmake@2.8:", type='build')
-    for v in ["1.4", "1.4.1", "1.5", "1.5.1", "1.6_rc1", "1.6_rc2", "1.6",
-              "master"]:
+    for v in ["1.4", "1.4.1", "1.5", "1.5.1", "1.6", "master"]:
         depends_on('votca-tools@%s' % v, when="@%s:%s.0" % (v, v))
     depends_on("boost")
     depends_on("gromacs~mpi@5.1:")
diff --git a/var/spack/repos/builtin/packages/votca-csgapps/package.py b/var/spack/repos/builtin/packages/votca-csgapps/package.py
index ee627df1f2..929bd73c79 100644
--- a/var/spack/repos/builtin/packages/votca-csgapps/package.py
+++ b/var/spack/repos/builtin/packages/votca-csgapps/package.py
@@ -21,14 +21,11 @@ class VotcaCsgapps(CMakePackage):
 
     version('master', branch='master')
     version('1.6', sha256='084bbc5b179bb7eb8f6671d2d5fa13e69e68946570c9120a7e4b10aff1866e2e')
-    version('1.6_rc2', sha256='4d829b10ada32ca9e589f894ca3f69fc14329af4b6f5fee32d5e07d2457a615a')
-    version('1.6_rc1', sha256='069002f93f891e4aeb24920c1b2458bf8ee4842d273481aea5fa32247f815f02')
     version('1.5.1',   sha256='b4946711e88a1745688b6cce5aad872e6e2ea200fededf38d77a864883e3750e')
     version('1.5',     sha256='18b40ce6222509bc70aa9d56b8c538cd5903edf7294d6f95530668e555206d5b')
     version('1.4.1',   sha256='095d9ee4cd49d2fd79c10e0e84e6890b755e54dec6a5cd580a2b4241ba230a2b')
     version('1.4',     sha256='4ea8348c2f7de3cc488f48fbd8652e69b52515441952766c06ff67ed1aaf69a0')
 
-    for v in ["1.4", "1.4.1", "1.5", "1.5.1", "1.6_rc1", "1.6_rc2", "1.6",
-              "master"]:
+    for v in ["1.4", "1.4.1", "1.5", "1.5.1", "1.6", "master"]:
         depends_on('votca-csg@%s' % v, when="@%s:%s.0" % (v, v))
     depends_on("boost")
diff --git a/var/spack/repos/builtin/packages/votca-tools/package.py b/var/spack/repos/builtin/packages/votca-tools/package.py
index 2ab759567e..52c9683f13 100644
--- a/var/spack/repos/builtin/packages/votca-tools/package.py
+++ b/var/spack/repos/builtin/packages/votca-tools/package.py
@@ -21,15 +21,13 @@ class VotcaTools(CMakePackage):
 
     version('master', branch='master')
     version('1.6', sha256='cfd0fedc80fecd009f743b5df47777508d76bf3ef294a508a9f11fbb42efe9a5')
-    version('1.6_rc2', sha256='1998148dc5bbdb63d05c24d19b4a803d9b2c800891a813fd846e53616d49abcd')
-    version('1.6_rc1', sha256='59b4bb64a93786a693e0cbc743a27c0bc451b9db2b0f63e4d2866f7aba10c268')
     version('1.5.1', sha256='4be4fe25a2910e24e1720cd9022d214001d38196033ade8f9d6e618b4f47d5c4')
     version('1.5', sha256='a82a6596c24ff06e79eab17ca02f4405745ceeeb66369693a59023ad0b62cf22')
     version('1.4.1', sha256='b6b87f6bec8db641a1d8660422ca44919252a69494b32ba6c8c9ac986bae9a65')
     version('1.4', sha256='41638122e7e59852af61d391b4ab8c308fd2e16652f768077e13a99d206ec5d3')
 
-    # https://github.com/votca/tools/pull/197, fix cmake module
-    patch("https://github.com/votca/tools/pull/197.patch", sha256="a06cce2a9cee63c8d01e4d1833f9cd2ba817b846c86fdb51ea5c9cd843135e68", when="@1.6_rc1")
+    # https://github.com/votca/tools/pull/229, fix mkl in exported target
+    patch("https://github.com/votca/tools/pull/229.patch", sha256="250d0b679e5d3104e3c8d6adf99751b71386c7ed4cbdae1c75408717ef3f401f", when="@1.6+mkl")
 
     variant('mkl', default=False, description='Build with MKL support')
     conflicts('+mkl', when='@:1.5.9999')
diff --git a/var/spack/repos/builtin/packages/votca-xtp/package.py b/var/spack/repos/builtin/packages/votca-xtp/package.py
index 3ff8b2537d..96c8de3f5b 100644
--- a/var/spack/repos/builtin/packages/votca-xtp/package.py
+++ b/var/spack/repos/builtin/packages/votca-xtp/package.py
@@ -21,15 +21,12 @@ class VotcaXtp(CMakePackage):
 
     version('master', branch='master')
     version('1.6', sha256='695c2d9d3f924103481529f992e3723bdce10b8edfc294421a849cdf51dbbb6e')
-    version('1.6_rc2', sha256='adc155e741a05e2bbfe9d928cdc4b2ec2ded34bc06aff59eaacf56c13a680be5')
-    version('1.6_rc1', sha256='144e74a6c4d31e490ca2bfaf4a30df12ccdc303efa5a7d1177c9b80035365ad5')
     version('1.5.1', sha256='17a7722e5a32d236e4f1f6f88b680da4ba5f52bcf65bca3687c6a1c731d10881')
     version('1.5', sha256='b40b6d19e13f0650e84b8beebe86ce5c09071624f18d66df826f9d8584b4d3c8')
     version('1.4.1', sha256='4b53d371d6cf648c9e9e9bd1f104d349cafeaf10a02866e3f1d05c574b595a21')
 
     depends_on("cmake@2.8:", type='build')
-    for v in ["1.4.1", "1.5", "1.5.1", "1.6_rc1", "1.6_rc2", "1.6",
-              "master"]:
+    for v in ["1.4.1", "1.5", "1.5.1", "1.6", "master"]:
         depends_on('votca-tools@%s' % v, when="@%s:%s.0" % (v, v))
         depends_on('votca-csg@%s' % v, when="@%s:%s.0" % (v, v))
     depends_on("libxc", when='@1.5:')