Fix the RPM SPEC from all of the re-arranging earlier