Fix up the spec file to match upstream changes