More fixes to the rpm build script
Merge branch 'refs/heads/f/rpm'