Replace bunch of rpm version checks with feature checks to get this to