Added fixes for 3.6-compatibility to spec-file template