More clean-up in spec files
Merge remote-tracking branch 'remotes/origin/master'