Fix error related to absence of rpmbuild
Merge branch 'stable'