Summary of changes: 40cd767... Mark -javadoc as noarch. Explicitly requires java-headless. (*) a01b813... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent