Change cmakelists, spec files for compatibility