Updated rpm spec file to include a fix for a regression in the builder.
Merge branch 'master' into devel