Two tweaks to automated RPM builds

See the commit messages below for more information.