Updated spec/CMakeLists to work with RHEL

* Added name-version suffix to docs path as RHEL uses that
* Updated CMakeLists to use this suffix
Merge branch 'master' into devel

* Want updated spec and CMakeLists