‘We have a deal,’ say Greece and Macedonia over name dispute