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. > > This patch was much easier to finally figure out once I first > wrote this other patch (still pending review): > https://www.redhat.com/archives/libvir-list/2013-September/msg00195.html > > src/Makefile.am | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/src/Makefile.am b/src/Makefile.am > index 9b336fd..37beb6c 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -1497,7 +1497,9 @@ if WITH_POLKIT1 > libvirt_driver_access_la_SOURCES += $(ACCESS_DRIVER_POLKIT_SOURCES) > > 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 Michal -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list