more robust create-rpm guards + added misc. in rpm spec