Tidied up RPM build configuration