commit c53b26d7600ad5a90a7949306a2a20647609bfdf
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Dec 19 13:47:13 2019 +0100
- rel 2; invalid shebangs now terminate build
rpm-build-macros.spec | 2 +-
rpm.macros | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 57e73d0..f3983f9 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -4,7 +4,7 @@ Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
Name: rpm-build-macros
Version: %{rpm_macros_rev}
-Release: 1
+Release: 2
License: GPL
Group: Development/Building
Source0: rpm.macros
diff --git a/rpm.macros b/rpm.macros
index 59712fa..b0f4195 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -809,8 +809,7 @@ __spec_install_post_check_shebangs() { \
%{!?debug:set +x;} \
fail=0; \
echo "Checking script shebangs..."; \
- find $RPM_BUILD_ROOT -type f -perm -500 -print | \
- while read f ; do \
+ for f in $(find $RPM_BUILD_ROOT -type f -perm -500 -print); do \
shebang="$(sed -e'1s/#! *\(.*\)/\1/;t;d;q' "$f")" ; \
f="${f##$RPM_BUILD_ROOT}"; \
case "$shebang" in \
@@ -830,7 +829,8 @@ __spec_install_post_check_shebangs() { \
esac ; \
done ; \
echo " DONE" ; \
-}; %{!?no_install_post_check_shebangs:__spec_install_post_check_shebangs} }
+ %{!?no_install_post_check_shebangs:return $fail;} \
+}; __spec_install_post_check_shebangs }}
# Remove common Perl files we don't package
%__spec_install_post_perl_clean {\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/c53b26d7600ad5a90a7949306a2a20647609bfdf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
