[libvirt] [PATCHv2.5] specfile: fix make rpm when with_driver_modules is 1

[Daniel P. Berrange]

On Mon, Dec 16, 2013 at 09:30:31AM -0700, Jim Fehlig wrote:
> Laine Stump wrote:
> > Commit ff76566 moved around things in the specfiles to put
> > driver-specific files into their appropriate sub-packages (when
> > with_driver_modules == 1), but accidentally changed things so that the
> > deamon-driver-network and daemon-config-network files were only
> > included in a package when with_driver_modules == 0. This broke "make
> > rpm" on fedora (where with_driver_modules == 1).
> >
> > This patch follows the pattern (already used for the files in other
> > sub-modules) of duplicating the files for the main package
> > (!with_driver_modules) and the sub-package (with_driver_modules).
> > ---
> >
> > Changes from V1: realized that %{_datadir} is /usr/share, so
> > %{_datadir}/libvirt/networks/default.xml should be installed as a part
> > of daemon-driver-network (or the main package, if not building with
> > driver modules).
> >
> >
> >  libvirt.spec.in | 13 ++++++++-----
> >  1 file changed, 8 insertions(+), 5 deletions(-)
> >
> > diff --git a/libvirt.spec.in b/libvirt.spec.in
> > index 849ec80..015e627 100644
> > --- a/libvirt.spec.in
> > +++ b/libvirt.spec.in
> > @@ -1894,11 +1894,6 @@ exit 0
> >          %endif
> >      %endif # ! %{with_driver_modules}
> >  
> > -    %if %{with_network}
> > -%files daemon-config-network
> > -%defattr(-, root, root)
> > -    %endif
> > -
> >   
> 
> So daemon-config-network has no files, but should this be removed? I
> noticed daemon-qemu, daemon-kvm, daemon-lxc, etc. define a %files
> section even though they have no files.
> 
> BTW, what is the purpose of daemon-config-network? Is it just to provide
> the %post scriptlet in some update cases, e.g. updating packages from
> pre to post with_driver_modules?

It exists to ensure that the default network gets defined.

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|