diff --git a/repack.d/common.sh b/repack.d/common.sh index 02d8b73e..a7268cb3 100755 --- a/repack.d/common.sh +++ b/repack.d/common.sh @@ -331,6 +331,12 @@ add_requires() __add_tag_after_d "Requires: $*" } +add_directrequires() +{ + [ -n "$1" ] || return + __add_tag_after_d "Requires: $*" +} + add_conflicts() { [ -n "$1" ] || return @@ -375,7 +381,6 @@ add_unirequires() fi } - install_requires() { [ -n "$1" ] || return @@ -402,10 +407,10 @@ __get_binary_requires() local fdir="$1" info " Getting executable requires ..." - epm req --short $(find "$fdir" -type f -executable) /dev/null | sed -e 's|().*||' + epm req --short $(find "$fdir" -type f -executable) /dev/null info " Getting libs requires ..." - epm req --short $(find "$fdir" -type f -name "lib*.so*") /dev/null | sed -e 's|().*||' + epm req --short $(find "$fdir" -type f -name "lib*.so*") /dev/null } __get_library_provides() @@ -459,7 +464,7 @@ add_libs_requires() info "Scanning for required libs soname ..." get_libs_requires | xargs -n6 echo | grep -ve '^$' | while read ll ; do info "Requires: $ll" - add_unirequires "$ll"