[gridsite-compat1.7] Tidy spec file.
Merge branch 'gridsite-compat1.7-fixes'