Merge branch 'jn/rpm-spec'