From db4905f51eb80b55c408e3a659bab6b4ec5d9e3b Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 10 Jun 2011 12:08:45 +0300 Subject: [PATCH] Adjust script detection rules to work with file >= 5.07 too (RhBug:712251) - Somewhere between file 5.05 and 5.07 it started adding encoding to script descriptions, eg " script text executable" became " script, text executable" breaking what had been working for 10+ years in the case of old find-requires. - Permit either comma or space after "script", this works for both old and new file. --- autodeps/linux.req | 5 +++-- fileattrs/script.attr | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/autodeps/linux.req b/autodeps/linux.req index cf60bd9..b9a8f99 100644 --- a/autodeps/linux.req +++ b/autodeps/linux.req @@ -20,10 +20,11 @@ fi # --- Grab the file manifest and classify files. #filelist=`sed "s/['\"]/\\\&/g"` filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"` -exelist=`echo $filelist | xargs -r file | grep -Ev ":.* (commands|script) " | \ +exelist=`echo $filelist | xargs -r file | \ + grep -Ev ":.* (commands|script)[, ]" | \ grep ":.*executable" | cut -d: -f1` scriptlist=`echo $filelist | xargs -r file | \ - grep -E ":.* (commands|script) " | cut -d: -f1` + grep -E ":.* (commands|script)[, ]" | cut -d: -f1` liblist=`echo $filelist | xargs -r file | \ grep ":.*shared object" | cut -d : -f1` diff --git a/fileattrs/script.attr b/fileattrs/script.attr index 13b8ba0..79f4d73 100644 --- a/fileattrs/script.attr +++ b/fileattrs/script.attr @@ -1,3 +1,3 @@ %__script_requires %{_rpmconfigdir}/script.req -%__script_magic ^.* script text.*$ +%__script_magic ^.* script[, ].*$ %__script_flags exeonly -- 2.7.4