From f8acb95ad3f9d6e082abe7d6b2a705f9a6143b6b Mon Sep 17 00:00:00 2001 From: Glenn Johnson Date: Wed, 15 Jan 2020 11:32:18 -0600 Subject: Convert encoding of script in interproscan (#14356) One of the perl scripts was encoded with ISO-8859-1, which caused the sbang replacement process to fail when spack uses python3. This PR converts the ps_scan script to UTF-8 encoding. --- var/spack/repos/builtin/packages/interproscan/package.py | 1 + var/spack/repos/builtin/packages/interproscan/ps_scan.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 var/spack/repos/builtin/packages/interproscan/ps_scan.patch diff --git a/var/spack/repos/builtin/packages/interproscan/package.py b/var/spack/repos/builtin/packages/interproscan/package.py index fe0a3acd1b..7ffb7c1da8 100644 --- a/var/spack/repos/builtin/packages/interproscan/package.py +++ b/var/spack/repos/builtin/packages/interproscan/package.py @@ -42,6 +42,7 @@ class Interproscan(Package): patch('large-gid.patch', when='@5:') patch('non-interactive.patch', when='@:4.8') + patch('ps_scan.patch', when='@:4.8') def install(self, spec, prefix): with working_dir('core'): diff --git a/var/spack/repos/builtin/packages/interproscan/ps_scan.patch b/var/spack/repos/builtin/packages/interproscan/ps_scan.patch new file mode 100644 index 0000000000..f34aa2c432 --- /dev/null +++ b/var/spack/repos/builtin/packages/interproscan/ps_scan.patch @@ -0,0 +1,12 @@ +diff -ru a/bin/ps_scan.pl b/bin/ps_scan.pl +--- a/bin/ps_scan.pl 2020-01-01 14:07:54.243869822 -0600 ++++ b/bin/ps_scan.pl 2020-01-01 14:08:03.786850313 -0600 +@@ -8,7 +8,7 @@ + # Authors: + # Alexandre Gattiker + # Edouard de Castro; E-mail: ecastro@isb-sib.ch +-# Béatrice Cuche (evaluated_by post-processing) ++# Béatrice Cuche (evaluated_by post-processing) + # + # Contributions: + # Lorenza Bordoli (repeat method) -- cgit v1.2.3-60-g2f50