Fix changelog
    
    rpmautospec doesn't like the merge: "unresolvable merge".
    To avoid the issue, re-add the changelog file. Also, let's drop the
    stuff that is only specific to EPEL, since this branch is primarily
    for rawhide.