merged spec file from trunk