[spamassassin/f15] (5 commits) ...Merge branch 'master' into f15

[Nick Bebout]

Summary of changes:

  c4e0f25... Update macros with rhel7 data (no build necessary) (*)
  30e3f4b... Don't install the sysvinit script if systemd is used (*)
  63359ce... Merge branch 'master' of ssh://pkgs.fedoraproject.org/spama (*)
  d445ae0... Bump release (*)
  3a8d1d3... Merge branch 'master' into f15

(*) This commit already existed in another branch; no separate mail sent