Simplified the RPM build scripts again

and some other stuff while looking through the package.log files.