More rpm-building updates