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