RPM specfile: remove macro accidentally re-added when handling merge conflict