Fix some more RPM warnings.

Fixes #5231