Various updates to spec files
Merge branch 'master' of proj.badc.rl.ac.uk:jasmin_scivm