Fixes to rpm targets
Updated some package building logic