[rfpkg/f27] (2 commits) ...Fix source and cleanup specs