Sync redhat spec with master