RPM: Correct specfile to use PKG_ID for prep name
RPM: Remove redundant version information from prep
Merge branch '1.3'