diff options
author | Michael Scherer <misc@mandriva.org> | 2010-04-07 22:08:37 +0000 |
---|---|---|
committer | Michael Scherer <misc@mandriva.org> | 2010-04-07 22:08:37 +0000 |
commit | 4ada6b1469f4d0fc2ea5d5ae8c095cc6845413fe (patch) | |
tree | 861a054b3e5ac1471f2fc2a1f10e86e1a38a7ffc | |
parent | 084e174dd9faacc5ecf2017d74d65a85adace17e (diff) | |
download | rpm-setup-4ada6b1469f4d0fc2ea5d5ae8c095cc6845413fe.tar rpm-setup-4ada6b1469f4d0fc2ea5d5ae8c095cc6845413fe.tar.gz rpm-setup-4ada6b1469f4d0fc2ea5d5ae8c095cc6845413fe.tar.bz2 rpm-setup-4ada6b1469f4d0fc2ea5d5ae8c095cc6845413fe.tar.xz rpm-setup-4ada6b1469f4d0fc2ea5d5ae8c095cc6845413fe.zip |
- do not requires python 2.X branch for python 3.X rpm, requires instead python 3.X
-rwxr-xr-x | find-requires.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/find-requires.in b/find-requires.in index 2415889..b3f5213 100755 --- a/find-requires.in +++ b/find-requires.in @@ -102,7 +102,9 @@ 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 >= \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\)/python3\([.0-9]\{1,\}\).*\\$@python3 >= 3\2@p" \ + -e "s@.*/usr/\(lib\|lib64\)/python2\([.0-9]\{1,\}\).*\\$@python >= 2\2@p"`" if [[ -n $dep && -z `echo $uniqdeplist $tmpdeplist|grep "$dep"` ]]; then tmpdeplist+="$dep\n" fi |