get rpm build machinery to work again.

far from optimal but main goal was to respect  previous conventions as much as possible while getting things to work again. 

best Regards,