Combine file directives in spec file

- Combine directives that apply to the same file in the 'files' sections
  of the sepc file. This should solve the warnings that are raised during
  the build.
- Add some section breaks to make spec file easier to read.
Update version number for test build