rpm-fix2: fix rpm binary prefix.
Merge branch 'rpm-fix2' into stable