rpm expand fixes

Ben Brownrequested to merge
benbrown/rpm-expand-fixes into tristan/rpm-export

Merge request reports