Fix: don't build srpm, directly create an RPM
Work in progress towards better directory naming