From e1489d63845d372a7c7209fd828f78381cbdc5d8 Mon Sep 17 00:00:00 2001 From: eagerterrier Date: Tue, 4 Apr 2023 15:11:16 +0100 Subject: [PATCH] FIX: fix for mangling shebang without this line, centos8 ARM fails builds with `*** WARNING {some dependency or file here, such as a readme} is executable but has no shebang, removing executable bit` This one liner fixes it --- templates/spec.hbs | 1 + test/fixtures/my-cool-api-7.spec | 1 + test/fixtures/my-cool-api-no-prune.spec | 1 + test/fixtures/my-cool-api-no-rebuild.spec | 1 + test/fixtures/my-cool-api-with-buildrequires.spec | 1 + test/fixtures/my-cool-api-with-diff-licence.spec | 1 + test/fixtures/my-cool-api-with-executable.spec | 1 + test/fixtures/my-cool-api-with-hyphenated-version.spec | 1 + test/fixtures/my-cool-api-with-node-version.spec | 1 + test/fixtures/my-cool-api-with-post.spec | 1 + test/fixtures/my-cool-api-with-requires-noescape.spec | 1 + test/fixtures/my-cool-api-with-requires.spec | 1 + .../my-cool-api-with-version-hyphens-replaced-underscores.spec | 1 + test/fixtures/my-cool-api-with-version-hyphens-replaced.spec | 1 + test/fixtures/my-cool-api.spec | 1 + test/fixtures/my-super-long-long-long-long-cat-api.spec | 1 + 16 files changed, 16 insertions(+) diff --git a/templates/spec.hbs b/templates/spec.hbs index 8e08cc7..96ef44c 100644 --- a/templates/spec.hbs +++ b/templates/spec.hbs @@ -3,6 +3,7 @@ %define version {{version}} %define release {{release}} %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-7.spec b/test/fixtures/my-cool-api-7.spec index 79645ed..02e8d79 100644 --- a/test/fixtures/my-cool-api-7.spec +++ b/test/fixtures/my-cool-api-7.spec @@ -3,6 +3,7 @@ %define version 1.1.1 %define release 7 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-no-prune.spec b/test/fixtures/my-cool-api-no-prune.spec index a21d2a9..21ecd76 100644 --- a/test/fixtures/my-cool-api-no-prune.spec +++ b/test/fixtures/my-cool-api-no-prune.spec @@ -3,6 +3,7 @@ %define version 1.1.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-no-rebuild.spec b/test/fixtures/my-cool-api-no-rebuild.spec index 30ab1ca..e391af9 100644 --- a/test/fixtures/my-cool-api-no-rebuild.spec +++ b/test/fixtures/my-cool-api-no-rebuild.spec @@ -3,6 +3,7 @@ %define version 1.1.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-with-buildrequires.spec b/test/fixtures/my-cool-api-with-buildrequires.spec index a03fc76..5c62945 100644 --- a/test/fixtures/my-cool-api-with-buildrequires.spec +++ b/test/fixtures/my-cool-api-with-buildrequires.spec @@ -3,6 +3,7 @@ %define version 1.1.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-with-diff-licence.spec b/test/fixtures/my-cool-api-with-diff-licence.spec index 77f23b3..fdf7596 100644 --- a/test/fixtures/my-cool-api-with-diff-licence.spec +++ b/test/fixtures/my-cool-api-with-diff-licence.spec @@ -3,6 +3,7 @@ %define version 1.1.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-with-executable.spec b/test/fixtures/my-cool-api-with-executable.spec index 8017699..4d9f389 100644 --- a/test/fixtures/my-cool-api-with-executable.spec +++ b/test/fixtures/my-cool-api-with-executable.spec @@ -3,6 +3,7 @@ %define version 1.1.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-with-hyphenated-version.spec b/test/fixtures/my-cool-api-with-hyphenated-version.spec index f650056..1131f17 100644 --- a/test/fixtures/my-cool-api-with-hyphenated-version.spec +++ b/test/fixtures/my-cool-api-with-hyphenated-version.spec @@ -3,6 +3,7 @@ %define version 1.1.1-pre-release-string.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-with-node-version.spec b/test/fixtures/my-cool-api-with-node-version.spec index 6729dfc..b5f7aac 100644 --- a/test/fixtures/my-cool-api-with-node-version.spec +++ b/test/fixtures/my-cool-api-with-node-version.spec @@ -3,6 +3,7 @@ %define version 1.1.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-with-post.spec b/test/fixtures/my-cool-api-with-post.spec index 4880af9..d880b19 100644 --- a/test/fixtures/my-cool-api-with-post.spec +++ b/test/fixtures/my-cool-api-with-post.spec @@ -3,6 +3,7 @@ %define version 1.1.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-with-requires-noescape.spec b/test/fixtures/my-cool-api-with-requires-noescape.spec index af84f36..5fb9a57 100644 --- a/test/fixtures/my-cool-api-with-requires-noescape.spec +++ b/test/fixtures/my-cool-api-with-requires-noescape.spec @@ -3,6 +3,7 @@ %define version 1.1.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-with-requires.spec b/test/fixtures/my-cool-api-with-requires.spec index d0dde48..bcf6660 100644 --- a/test/fixtures/my-cool-api-with-requires.spec +++ b/test/fixtures/my-cool-api-with-requires.spec @@ -3,6 +3,7 @@ %define version 1.1.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-with-version-hyphens-replaced-underscores.spec b/test/fixtures/my-cool-api-with-version-hyphens-replaced-underscores.spec index af51fb7..31502e8 100644 --- a/test/fixtures/my-cool-api-with-version-hyphens-replaced-underscores.spec +++ b/test/fixtures/my-cool-api-with-version-hyphens-replaced-underscores.spec @@ -3,6 +3,7 @@ %define version 1.1.1_pre_release_string.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api-with-version-hyphens-replaced.spec b/test/fixtures/my-cool-api-with-version-hyphens-replaced.spec index 99549c2..a354738 100644 --- a/test/fixtures/my-cool-api-with-version-hyphens-replaced.spec +++ b/test/fixtures/my-cool-api-with-version-hyphens-replaced.spec @@ -3,6 +3,7 @@ %define version 1.1.1~pre~release~string.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-cool-api.spec b/test/fixtures/my-cool-api.spec index 123966f..f830f4b 100644 --- a/test/fixtures/my-cool-api.spec +++ b/test/fixtures/my-cool-api.spec @@ -3,6 +3,7 @@ %define version 1.1.1 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version} diff --git a/test/fixtures/my-super-long-long-long-long-cat-api.spec b/test/fixtures/my-super-long-long-long-long-cat-api.spec index 9ec6f4d..329de01 100644 --- a/test/fixtures/my-super-long-long-long-long-cat-api.spec +++ b/test/fixtures/my-super-long-long-long-long-cat-api.spec @@ -3,6 +3,7 @@ %define version 1.0.0 %define release 1 %define buildroot %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%undefine __brp_mangle_shebangs Name: %{name} Version: %{version}