Updating to address conflict errors reported on forum.

Well well well Mr Walker. Did we now learn how to use the %dir directive in spec files now?

I think we did new CI build system.

Oooops..