Fix the spec file to match upstream changes