]>
Commit | Line | Data |
---|---|---|
696c40ec ER |
1 | --- rpm-4.5/scripts/pythondeps.sh 2007-05-25 20:36:39.000000000 +0300 |
2 | +++ rpm-4.5/scripts/pythondeps.sh 2010-03-21 14:07:18.049336515 +0200 | |
3 | @@ -5,7 +5,8 @@ | |
4 | exit 0 | |
5 | } | |
6 | ||
7 | -PYVER=`python -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v"` | |
8 | +# $PYVER is exported by rpm macro | |
9 | +PYVER=${PYVER:-$(python -c "import sys; print '%d.%d' % sys.version_info[:2]")} | |
10 | case $1 in | |
11 | -P|--provides) | |
12 | shift | |
13 | --- rpm-4.5/macros.in~ 2010-03-21 14:03:42.559283734 +0200 | |
14 | +++ rpm-4.5/macros.in 2010-03-21 14:05:18.419287370 +0200 | |
15 | @@ -1401,8 +1401,8 @@ | |
16 | # | |
17 | # Note: Used iff _use_internal_dependency_generator is non-zero. The | |
18 | # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. | |
19 | -%__python_provides %{_rpmhome}/pythondeps.sh --provides | |
20 | -%__python_requires %{_rpmhome}/pythondeps.sh --requires | |
21 | +%__python_provides /usr/bin/env PYVER=%py_ver %{_rpmhome}/pythondeps.sh --provides | |
22 | +%__python_requires /usr/bin/env PYVER=%py_ver %{_rpmhome}/pythondeps.sh --requires | |
23 | ||
24 | # Useful macros for building *.rpm python packages (for python > 1.6). | |
25 | # |