[emi-cream-nagios] Tidy spec file and fix %setup flags.
Merge branch 'emi-cream-nagios-fixes'