r7824: merging specfile fixes from 3.0