aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2008-11-24 02:49:06 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2008-11-24 02:49:06 +0000
commitcc432b78f2ba3bbf95a38bbba03f0513820a4d4d (patch)
treec39e7fa7f37730cb758e04a39e9995f3c542324c
parent75f87740c1bb9416116bf1d424d534fadd0de9d9 (diff)
downloadrpm-setup-cc432b78f2ba3bbf95a38bbba03f0513820a4d4d.tar
rpm-setup-cc432b78f2ba3bbf95a38bbba03f0513820a4d4d.tar.gz
rpm-setup-cc432b78f2ba3bbf95a38bbba03f0513820a4d4d.tar.bz2
rpm-setup-cc432b78f2ba3bbf95a38bbba03f0513820a4d4d.tar.xz
rpm-setup-cc432b78f2ba3bbf95a38bbba03f0513820a4d4d.zip
fix broken site_perl regexp which would add versioned requires without epoch
and merge it with vendor_perl regexp
-rwxr-xr-xfind-requires.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/find-requires.in b/find-requires.in
index d8901d9..17ca82d 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -101,7 +101,7 @@ fi
tmpdeplist=
for f in $filelist; do
- dep="`echo $f | sed -n -e "s@.*/usr/lib/perl5/\(site_perl/\)\([0-9]\{1,\}\.[0-9]\{1,\}\)\.\([0-9]\{1,\}\).*\\$@perl-base >= \2.\3@p" -e "s@.*/usr/lib/perl5/\(vendor_perl\/\)\([.0-9]\{1,\}\).*\\$@perl-base >= $perlepoch\2@p" -e "s@.*/usr/\(lib\|lib64\)/python\([.0-9]\{1,\}\).*\\$@python-base >= \2@p"`"
+ 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-base >= \2@p"`"
if [[ -n $dep && -z `echo $uniqdeplist $tmpdeplist|grep "$dep"` ]]; then
tmpdeplist+="$dep\n"
fi