[emi-emir] Tidy spec file & fix sources.