Update CMakeLists.txt and spec files