Remove unneded m4-stuff, fix spec-file-template and my update-script for it