Sync the spec file with downstream

Some noise has been added due to the mass rebuild.