Fix logic in srpm spec
Merge branch 'master' into rails-3-2-16