[rp-pppoe/f21] (5 commits) ...fix merge

[Peter Robinson]

Summary of changes:

  8d9f028... bz#1073897, systemd service file pppoe-server.service insta (*)
  6f9af0d... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  ad3f181... bz#850300, new systemd-rpm macros in rp-pppoe spec file (*)
  1c21fbb... Cleanup and modernise spec, Build as a hardened build as pe (*)
  4eae93e... fix merge

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