Fix the RPM packages not building...
Broke it again, but headed in the right direction...
Coding style cleanup (extra commas)...