merge most spec file changes from cmake branch