Update RPM packaging to match Debian/Ubuntu changes for source preparation
Clean up code and tidy up ready so that accept default rules can work.
Some trivial code tidy left over from the merges.
Minor typo fixes.