aboutsummaryrefslogtreecommitdiffstats
path: root/find-requires.in
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2010-11-01 23:20:42 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2010-11-01 23:20:42 +0000
commit4b817211ca760df23036c208316d07e4fafde272 (patch)
tree3c6e0cf19432d607661330270cd6350494e1cca5 /find-requires.in
parent0efa39c222570bfd099647ccc668ce9414a85bdc (diff)
downloadrpm-setup-4b817211ca760df23036c208316d07e4fafde272.tar
rpm-setup-4b817211ca760df23036c208316d07e4fafde272.tar.gz
rpm-setup-4b817211ca760df23036c208316d07e4fafde272.tar.bz2
rpm-setup-4b817211ca760df23036c208316d07e4fafde272.tar.xz
rpm-setup-4b817211ca760df23036c208316d07e4fafde272.zip
enable python egg provides/requires1.112
Diffstat (limited to 'find-requires.in')
-rwxr-xr-xfind-requires.in7
1 files changed, 3 insertions, 4 deletions
diff --git a/find-requires.in b/find-requires.in
index 09b280c..79a4feb 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -102,8 +102,7 @@ fi
tmpdeplist=
for f in $filelist; do
- dep="`echo $f | sed -n -e "s@.*/usr/lib/perl5/\(vendor_perl/\|site_perl/\|\)\([.0-9]\{1,\}\).*\\$@perl-base >= $perlepoch\2@p" \
- -e "s@.*/usr/\(lib\|lib64\)/python\([.0-9]\{1,\}\).*\\$@python(abi) = \2@p"`"
+ dep="`echo $f | sed -n -e "s@.*/usr/lib/perl5/\(vendor_perl/\|site_perl/\|\)\([.0-9]\{1,\}\).*\\$@perl-base >= $perlepoch\2@p"`"
if [[ -n $dep && -z `echo $uniqdeplist $tmpdeplist|grep "$dep"` ]]; then
tmpdeplist+="$dep\n"
fi
@@ -208,8 +207,8 @@ fi
#
# --- Python modules.
-[ -x @RPMVENDORDIR@/python.req -a -n "$pythonlist" ] && \
- echo $pythonlist | tr '[:blank:]' \\n | @RPMVENDORDIR@/python.req | sort -u
+[ -x @RPMVENDORDIR@/pythoneggs.py -a -n "$filelist" ] && \
+ echo $filelist | tr '[:blank:]' \\n | @RPMVENDORDIR@/pythoneggs.py --requires | sort -u
#
# --- Tcl modules.