packaging: update spec and upstream rebased