r10960: merging changes to specfile from 3.0.20b release