Fix dependency of geant4 (amends #16497) (#16504)

* Fix dependency of geant4 (amends #16497)

* Update geant4-data dependencies

* Reviewer comments (part 1/2)

* Reviewer comments (part 2/2)

* Update var/spack/repos/builtin/packages/geant4-data/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

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

@@ -15,6 +15,7 @@ class G4emlow(Package):
     maintainers = ['drbenmorgan']
 
     # Only versions relevant to Geant4 releases built by spack are added
+    version('7.9.1', sha256='820c106e501c64c617df6c9e33a0f0a3822ffad059871930f74b8cc37f043ccb')
     version('7.9', sha256='4abf9aa6cda91e4612676ce4d2d8a73b91184533aa66f9aad19a53a8c4dc3aff')
     version('7.7', sha256='16dec6adda6477a97424d749688d73e9bd7d0b84d0137a67cf341f1960984663')
     version('7.3', sha256='583aa7f34f67b09db7d566f904c54b21e95a9ac05b60e2bfb794efb569dba14e')

var/spack/repos/builtin/packages/geant4-data/package.py

@@ -15,6 +15,7 @@ class Geant4Data(BundlePackage):
 
     maintainers = ['drbenmorgan']
 
+    version('10.6.1')
     version('10.6.0')
     version('10.5.1')
     version('10.4.3')
@@ -28,17 +29,18 @@ class Geant4Data(BundlePackage):
     # they generally don't change on the patch level
     # Can move to declaring on a dataset basis if needed
     # geant4@10.6.X
-    depends_on("g4ndl@4.6", when='@10.6.0')
+    depends_on("g4ndl@4.6", when='@10.6.0:10.6.9999')
     depends_on("g4emlow@7.9", when='@10.6.0')
-    depends_on("g4photonevaporation@5.5", when='@10.6.0')
-    depends_on("g4radioactivedecay@5.4", when='@10.6.0')
-    depends_on("g4particlexs@2.1", when='@10.6.0')
-    depends_on("g4pii@1.3", when='@10.6.0')
-    depends_on("g4realsurface@2.1.1", when='@10.6.0')
-    depends_on("g4saiddata@2.0", when='@10.6.0')
-    depends_on("g4abla@3.1", when='@10.6.0')
-    depends_on("g4incl@1.0", when='@10.6.0')
-    depends_on("g4ensdfstate@2.2", when='@10.6.0')
+    depends_on("g4emlow@7.9.1", when='@10.6.1:10.6.9999')
+    depends_on("g4photonevaporation@5.5", when='@10.6.0:10.6.9999')
+    depends_on("g4radioactivedecay@5.4", when='@10.6.0:10.6.9999')
+    depends_on("g4particlexs@2.1", when='@10.6.0:10.6.9999')
+    depends_on("g4pii@1.3", when='@10.6.0:10.6.9999')
+    depends_on("g4realsurface@2.1.1", when='@10.6.0:10.6.9999')
+    depends_on("g4saiddata@2.0", when='@10.6.0:10.6.9999')
+    depends_on("g4abla@3.1", when='@10.6.0:10.6.9999')
+    depends_on("g4incl@1.0", when='@10.6.0:10.6.9999')
+    depends_on("g4ensdfstate@2.2", when='@10.6.0:10.6.9999')
 
     # geant4@10.5.X
     depends_on("g4ndl@4.5", when='@10.5.0:10.5.9999')

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

@@ -41,6 +41,7 @@ class Geant4(CMakePackage):
     depends_on('cmake@3.5:', type='build')
     depends_on('cmake@3.8:', type='build', when='@10.6.0:')
 
+    depends_on('geant4-data@10.6.1', when='@10.6.1')
     depends_on('geant4-data@10.6.0', when='@10.6.0')
     depends_on('geant4-data@10.5.1', when='@10.5.1')
     depends_on('geant4-data@10.4.3', when='@10.4.3')