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