Fix errors in rpm.spec.in when merging with stable.