geant4: fix bad patch for 10.x (#48332)

var/spack/repos/builtin/packages/geant4/columns-10.patch

@@ -0,0 +1,13 @@
+diff --git a/source/externals/g4tools/include/tools/wroot/columns.icc b/source/externals/g4tools/include/tools/wroot/columns.icc
+index 0df2c16620..af9b15e0ab 100644
+--- a/source/analysis/g4tools/include/tools/wroot/columns.icc
++++ b/source/analysis/g4tools/include/tools/wroot/columns.icc
+@@ -399,7 +399,7 @@
+   protected:
+     std_vector_column_ref(const std_vector_column_ref& a_from)
+     :icol(a_from)
+-    ,m_branch(a_from.m_barnch)
++    ,m_branch(a_from.m_branch)
+     ,m_ref(a_from.m_ref)
+     ,m_leaf(0)
+     ,m_leaf_count(0)

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

@@ -208,7 +208,8 @@ def std_when(values):
     patch("geant4-10.0.4.patch", when="@10.0.4")
     # Fix member field typo in g4tools wroot
     # See https://bugzilla-geant4.kek.jp/show_bug.cgi?id=2640
-    patch("columns.patch", when="@10.4:11.2.2")
+    patch("columns-11.patch", when="@11:11.2.2")
+    patch("columns-10.patch", when="@10.4:10")
     # As released, 10.03.03 has issues with respect to using external
     # CLHEP.
     patch("CLHEP-10.03.03.patch", level=1, when="@10.3")