Final (?) fixes to RPM building