Manually updating spec files. Tagged for 1.8-6.