City approves abandonment, replat for new Dollar General