pck-update (-a6): fix for requirements like libGLUT>=3.7

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-02-05 19:47:02 +01:00
parent 7c7004d1e8
commit e682c64fc0
2 changed files with 9 additions and 3 deletions

View File

@ -22,6 +22,9 @@ Changes in version 1.9.2
specfiles by running `rpm -q --specfile --specedit ...'. specfiles by running `rpm -q --specfile --specedit ...'.
(Problem detected by Silvan Calarco). (Problem detected by Silvan Calarco).
* pck-update - Davide Madrisan:
Action 6: do support static requirements containing <,>,<=,>=,...
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 1.9.1 Changes in version 1.9.1

View File

@ -2372,10 +2372,13 @@ $pck-$pck_rpmversion-$pck_rpmrelease$DISTRO_rpm.$target_cpu.rpm"
( rpm -p -q --requires ${pcks_list[*]} | sort -u | \ ( rpm -p -q --requires ${pcks_list[*]} | sort -u | \
while read line; do while read line; do
buildreq="" buildreq=""
req=${line// /} # ex: libresolv.so.2(GLIBC_2.2) > 2.10
# --> libresolv.so.2(GLIBC_2.2)
req="$(echo "$line" | sed "s, ,,g;s,<.*,,;s,>.*,,;s,=.*,,")"
if [ -n "$(for p in ${pcks_provides[*]}; do if [ -n "$(for p in ${pcks_provides[*]}; do
# self-provided requirement # self-provided requirement
[ "$p" = "${req}" ] && echo "$p"; done)" ]; then [ "$p" = "${req}" ] && echo "$p"
done)" ]; then
: :
elif [ "${req:0:1}" = "/" ]; then elif [ "${req:0:1}" = "/" ]; then
# file requirement; ignore # file requirement; ignore