diff --git a/brp-mangle-shebangs b/brp-mangle-shebangs index 6d65a82..4fa8daa 100755 --- a/brp-mangle-shebangs +++ b/brp-mangle-shebangs @@ -121,6 +121,10 @@ while IFS= read -r -d $'\0' f; do # /whatsoever/env foo → /whatsoever/foo shebang=$(echo "$shebang" | sed -r -e 's@^(.+/)env (.+)$@\1\2@') + # If the shebang now starts with /bin, change it to /usr/bin + # https://bugzilla.redhat.com/show_bug.cgi?id=1581757 + shebang=$(echo "$shebang" | sed -r -e 's@^/bin/@/usr/bin/@') + # Replace ambiguous python with python2 py_shebang=$(echo "$shebang" | sed -r -e 's@/usr/bin/python(\s|$)@/usr/bin/python2\1@') diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index b495529..6fad0e6 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 116 +Version: 117 Release: 1%{?dist} # No version specified. License: GPL+ @@ -183,6 +183,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Mon Jul 16 2018 Miro Hrončok - 117-1 +- Mangle /bin shebnags to /usr/bin ones (#1581757) + * Tue Jul 10 2018 Igor Gnatenko - 116-1 - Add option to add -Wl,--as-needed into LDFLAGS