Basic update to CMakeLists.txt and spec file