Rpm fixes

First patch can be included freely.
Second assume you are updating to CentOS 6.4