- upstream aae16d0cd626 - add common subpackage for license and doc files - spec tidying and ordering spec subpackages