Merge back specfile changes from release