openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pck-update (-a6): code cleanups

Browse Source 
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-01-31 00:54:51 +01:00
parent bc66419a27
commit 062ef27deb
1 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
plugins/pck-update.in
View File

@ -2367,7 +2367,7 @@ $pck-$pck_rpmversion-$pck_rpmrelease$DISTRO_rpm.$target_cpu.rpm"
# display all the build requirements
( rpm -p -q --requires ${pcks_list[*]} | sort -u | \
while read line; do
buildreq=
buildreq=""
req=${line// /}
if [ -n "$(for p in ${pcks_provides[*]}; do
# self-provided requirement
@ -2396,29 +2396,39 @@ $pck-$pck_rpmversion-$pck_rpmrelease$DISTRO_rpm.$target_cpu.rpm"
elif [ "${req}" = "python(abi)" ]; then
# FIXME: libpython-devel should be defined in autospec.conf
# python requirement
buildreq=libpython-devel
elif [ "${req/.so*/}" != "$req" ]; then
# requirement is a shared library
req=${req/(*)/}
lib=${req/.*/}.so
libpath=`$path_ldconfig -p | grep $req`
libpath=${libpath/\(*\)/}
if [ "$libpath" ]; then
libpath=${libpath/* => /}
solibpath="${libpath/.so*/}.so"
if [ ! -e $solibpath \
-a "${solibpath:0:5}" = "/lib/" ]; then
solibpath="/usr$solibpath"
fi
eval buildreq=`rpm -qf $solibpath 2>/dev/null | \
sed "s|\(.*\)-[^-]*-[^-]*|\1|"` 2>/dev/null
if [ ! "$buildreq" -o $? -ne 0 ]; then
buildreq="libpython-devel"
elif [[ "$req" =~ .*\.so\.[0-9]* ]]; then
solibpath_catch=""
# is a shared library
# req="libGL.so.1(libc6)" => /usr/lib/libGL.so
solibpath=$($path_ldconfig -Np | \
sed -n "s, ,,g;/${req/(*)/}/{
s,.*=>,,;s,\.so\..*,.so,p}")
notify.debug "req=\"$req\" => solibpath=\"$solibpath\""
if [ "$solibpath" ]; then
if [ -e $solibpath ]; then
solibpath_catch="$solibpath"
else
# let's try removing version extension in libname
# (eg. liblber-2.2.so => liblber.so)
solibpath=`echo $solibpath | sed "s|-[0-9.]*\.so|.so|"`
eval buildreq=`rpm -qf $solibpath 2>/dev/null | \
sed "s|\(.*\)-[^-]*-[^-]*|\1|"` 2>/dev/null
[ ! "$buildreq" -o $? -ne 0 ] &&
solibpath_alternate="\
$(echo $solibpath | sed "s|-[0-9.]*\.so|.so|")"
if [ -e $solibpath_alternate ]; then
solibpath_catch="$solibpath_alternate"
else
if [ "${solibpath:0:5}" = "/lib/" -o \
"${solibpath:0:7}" = "/lib64/" ]; then
[ -e "/usr${solibpath}" ] &&
solibpath_catch="/usr${solibpath}"
fi
fi
fi
if [ "$solibpath_catch" ]; then
eval buildreq="\
$(rpm --qf %{name} -qf $solibpath_catch 2>/dev/null)" 2>/dev/null
[ -z "$buildreq" -o $? -ne 0 ] && echo "\
#$req: $solibpath_catch: file not owned by any package"
else
echo "#$req: .so link not found"
fi
else
@ -2427,16 +2437,16 @@ $pck-$pck_rpmversion-$pck_rpmrelease$DISTRO_rpm.$target_cpu.rpm"
fi
else
# unidentified requirement
buildreq=`rpm -q --whatprovides $req 2>/dev/null | \
sed "s|\(.*\)-[^-]*-[^-]*|\1|"`
[ "$buildreq" ] || \
eval buildreq="$(\
rpm -q --qf %{name} --whatprovides $req 2>/dev/null)"
[ -z "$buildreq" -o $? -ne 0 ] &&
echo "#$req: not found; what is this?"
fi
if [ "${buildreq}" \
-a "${buildreq/%-devel/}" = "${buildreq}" ]; then
if [ -n "$buildreq" \
-a "${buildreq/%-devel/}" = "$buildreq" ]; then
# if a -devel exists for this package, use it
develpkg=`rpm -q ${buildreq}-devel 2>/dev/null` &&
buildreq=`echo $develpkg | sed "s|\(.*\)-[^-]*-[^-]*|\1|"`
rpm -q ${buildreq}-devel &>/dev/null &&
buildreq="$(rpm -q --qf %{name} ${buildreq}-devel)"
fi
# finally print buildrequires block
[ "$buildreq" ] && echo "BuildRequires: $buildreq"