From b7bb687d17d6adc1c5dd7ef74997612293581de1 Mon Sep 17 00:00:00 2001 From: haralmha <47558670+haralmha@users.noreply.github.com> Date: Wed, 26 Jan 2022 11:16:02 +0100 Subject: vbfnlo: use patch method and filter_file instead of patch directive (#28506) * Patch only for @3.0.0beta5 * Replace version specific patch file with patch function Co-authored-by: root --- var/spack/repos/builtin/packages/vbfnlo/package.py | 5 ++++- .../repos/builtin/packages/vbfnlo/vbfnlo_no_docs.patch | 13 ------------- 2 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/vbfnlo/vbfnlo_no_docs.patch diff --git a/var/spack/repos/builtin/packages/vbfnlo/package.py b/var/spack/repos/builtin/packages/vbfnlo/package.py index f29d1fc507..9cdd0a5b48 100644 --- a/var/spack/repos/builtin/packages/vbfnlo/package.py +++ b/var/spack/repos/builtin/packages/vbfnlo/package.py @@ -30,7 +30,6 @@ class Vbfnlo(AutotoolsPackage): # See https://github.com/vbfnlo/vbfnlo/issues/2 variant('doc', default=False, description='Build documentation') - patch('vbfnlo_no_docs.patch', when='~doc') depends_on('hepmc') depends_on('gsl') @@ -53,3 +52,7 @@ class Vbfnlo(AutotoolsPackage): "FCFLAGS=-std=legacy"] return args + + @when('@3.0.0beta3:~doc') + def patch(self): + filter_file("lib src doc", "lib src", "Makefile.am") diff --git a/var/spack/repos/builtin/packages/vbfnlo/vbfnlo_no_docs.patch b/var/spack/repos/builtin/packages/vbfnlo/vbfnlo_no_docs.patch deleted file mode 100644 index 520ac74334..0000000000 --- a/var/spack/repos/builtin/packages/vbfnlo/vbfnlo_no_docs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index e3cfec3..ebf48f4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -5,7 +5,7 @@ SUBDIRS = include \ - loops \ - amplitudes \ - phasespace \ -- lib src doc \ -+ lib src \ - regress - - ACLOCAL_AMFLAGS = -I m4 -- cgit v1.2.3-60-g2f50