From f621e97f473b7a55dac140e6aa76201f00f9b077 Mon Sep 17 00:00:00 2001 From: Scott McMillan Date: Mon, 2 Nov 2020 10:12:15 -0600 Subject: [PATCH] Fix issue with NAMD patch not applying cleanly (#19675) Co-authored-by: Scott McMillan --- .../{inherited-member.patch => inherited-member-2.13.patch} | 0 var/spack/repos/builtin/packages/namd/package.py | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename var/spack/repos/builtin/packages/namd/{inherited-member.patch => inherited-member-2.13.patch} (100%) diff --git a/var/spack/repos/builtin/packages/namd/inherited-member.patch b/var/spack/repos/builtin/packages/namd/inherited-member-2.13.patch similarity index 100% rename from var/spack/repos/builtin/packages/namd/inherited-member.patch rename to var/spack/repos/builtin/packages/namd/inherited-member-2.13.patch diff --git a/var/spack/repos/builtin/packages/namd/package.py b/var/spack/repos/builtin/packages/namd/package.py index f7cccc2b594..1da71d20f53 100644 --- a/var/spack/repos/builtin/packages/namd/package.py +++ b/var/spack/repos/builtin/packages/namd/package.py @@ -35,8 +35,8 @@ class Namd(MakefilePackage): # init_tcl_pointers() declaration and implementation are inconsistent # "src/colvarproxy_namd.C", line 482: error: inherited member is not # allowed - patch('inherited-member.patch', when='@:2.13') - patch('inherited-member-2.14.patch', when='@2.14:') + patch('inherited-member-2.13.patch', when='@2.13') + patch('inherited-member-2.14.patch', when='@2.14') depends_on('charmpp@6.10.1:', when="@2.14:") depends_on('charmpp@6.8.2', when="@2.13")