[libvirt] [PATCH] fixes to allow 'make rpm' to work again