From 041c201f6447ff10c6ab6710cd29b5149f838da4 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jan 31 2018 14:15:43 +0000 Subject: Remove shebang and executable bit from python-macro-helper (#1538657) --- diff --git a/rpm.spec b/rpm.spec index f62716e..7d324e4 100644 --- a/rpm.spec +++ b/rpm.spec @@ -23,7 +23,7 @@ %global rpmver 4.14.1 #global snapver rc2 -%global rel 5 +%global rel 6 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} @@ -341,6 +341,11 @@ nice/ionice priorities. Should not be used on systemd systems. ln -s db-%{bdbver} db %endif +# https://bugzilla.redhat.com/show_bug.cgi?id=1538657 +head -n1 scripts/python-macro-helper | grep -E '^#!/usr/bin/' && sed -i '1d' scripts/python-macro-helper +chmod -x scripts/python-macro-helper + + %build %if %{without int_bdb} #CPPFLAGS=-I%{_includedir}/db%{bdbver} @@ -443,6 +448,9 @@ rm -f $RPM_BUILD_ROOT/%{_fileattrsdir}/{perl*,python*} # Axe unused cruft rm -f $RPM_BUILD_ROOT/%{rpmhome}/{tcl.req,osgideps.pl} +# https://bugzilla.redhat.com/show_bug.cgi?id=1538657 +chmod -x $RPM_BUILD_ROOT/%{rpmhome}/python-macro-helper + %if %{with check} %check make check || cat tests/rpmtests.log @@ -585,7 +593,10 @@ make check || cat tests/rpmtests.log %doc doc/librpm/html/* %changelog -* Tue Jan 30 2018 Tomas Orsava - 4.14.1-4 +* Wed Jan 31 2018 Miro Hrončok - 4.14.1-6 +- Remove shebang and executable bit from python-macro-helper (#1538657) + +* Tue Jan 30 2018 Tomas Orsava - 4.14.1-5 - Add envvar that will be present during RPM build, Part of a Fedora Change for F28: "Avoid /usr/bin/python in RPM build" https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build