aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2010-10-30 03:11:14 +0000
committerAnssi Hannula <anssi@mandriva.org>2010-10-30 03:11:14 +0000
commit9c94735c6bab67a0fc6513b1dcf265a4b45b34cb (patch)
tree7e0a42b38a0cc1dcbc00d2698005587559f0a366
parent8316ef1fd0fa4c482e82007880d6f8abc153876d (diff)
downloadrpm-setup-9c94735c6bab67a0fc6513b1dcf265a4b45b34cb.tar
rpm-setup-9c94735c6bab67a0fc6513b1dcf265a4b45b34cb.tar.gz
rpm-setup-9c94735c6bab67a0fc6513b1dcf265a4b45b34cb.tar.bz2
rpm-setup-9c94735c6bab67a0fc6513b1dcf265a4b45b34cb.tar.xz
rpm-setup-9c94735c6bab67a0fc6513b1dcf265a4b45b34cb.zip
Generate requires on "python(abi) = x.y" instead of "python >= x.y" for
python modules to properly handle the strict dependency.
-rw-r--r--NEWS3
-rwxr-xr-xfind-requires.in3
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 627a060..9ab040b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- generate requires on "python(abi) = x.y" instead of "python >= x.y" for
+ python modules to properly handle the strict dependency
+
Version 1.110 - 18 October 2010, by Per Øyvind Karlsen
- fix warning from rubygems.rb
- drop %gem_unpack, equivalent behaviour has been implemented in %setup now
diff --git a/find-requires.in b/find-requires.in
index 7fd1eae..09b280c 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -103,8 +103,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\)/python3\([.0-9]\{1,\}\).*\\$@python3 >= 3\2@p" \
- -e "s@.*/usr/\(lib\|lib64\)/python2\([.0-9]\{1,\}\).*\\$@python >= 2\2@p"`"
+ -e "s@.*/usr/\(lib\|lib64\)/python\([.0-9]\{1,\}\).*\\$@python(abi) = \2@p"`"
if [[ -n $dep && -z `echo $uniqdeplist $tmpdeplist|grep "$dep"` ]]; then
tmpdeplist+="$dep\n"
fi