On 09/04/2013 07:22 AM, Michal Privoznik wrote: > On 04.09.2013 05:07, Eric Blake wrote: >> Untested for now (it's late for me), but seems right... >> >> daemon/Makefile.am installs a .policy file if WITH_POLKIT is set >> (which is supposedly the union between WITH_POLKIT0 and WITH_POLKIT1). >> src/Makefile.am, on the other hand, installs a .policy file if >> WITH_POLKIT1 is set. When running 'make rpm' with client_only >> manually set, on a Fedora 19 box, it appears that WITH_POLKIT1 is >> true (the polkit 1 library exists) but WITH_POLKIT is false (the >> spec file requests that configure explicitly use --without-polkit), >> which leads to this failure: >> >> RPM build errors: >> Installed (but unpackaged) file(s) found: >> /usr/share/polkit-1/actions/org.libvirt.api.policy >> >> Fix it by adding another conditional. >> >> Signed-off-by: Eric Blake <eblake@xxxxxxxxxx> >> --- >> >> I'll test this before pushing (and amend the commit message >> to drop the first paragraph), even if it gets a positive >> review in the meantime. Glad I tested; the magic conditional was WITH_LIBVIRTD, rather than WITH_POLKIT. (Again, it's a shame that automake doesn't allow indented 'if/endif' to show how deeply nested things are, as the WITH_LIBVIRTD conditional in daemon/Makefile.am is much further away from the installation of a .policy file). >> >> polkitactiondir = $(datadir)/polkit-1/actions >> +if WITH_POLKIT >> polkitaction_DATA = $(ACCESS_DRIVER_POLKIT_POLICY) >> +endif WITH_POLKIT >> >> $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ >> $(srcdir)/access/genpolkit.pl Makefile.am >> > > ACK I pushed the fixed version that actually passed testing. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list