Build: rpm: simplify rpmbuild

c071e92b and 6a967a93 tried to compensate for versions of rpmbuild that don't
support the --with/--without options.

However as of 2.1.0, we require a minimum of rpm 4.11.0, which does support
them, so we can greatly simplify RPM creation. This also addresses some minor
inconsistencies.