Fix "make dist" to include version number, docouple it from rpm packaging