use source from pypi
use more macros
upstream 4.2.4