From 629e5aaef7582ea18e1f773895cb77ba1d0727fd09b7e47bf0970d7408bbf286 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 21 Jan 2014 01:24:00 +0000 Subject: [PATCH] - Fix build on code 11 - Fix rpmlint warning OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=344 --- libvirt.changes | 6 ++++++ libvirt.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libvirt.changes b/libvirt.changes index ff52f82..d46e5cc 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 20 18:22:59 MST 2014 - jfehlig@suse.com + +- Fix build on code 11 +- Fix rpmlint warning + ------------------------------------------------------------------- Mon Jan 20 17:40:10 MST 2014 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index e7ac02f..fc22a77 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -519,7 +519,7 @@ for specific drivers. %if %{with_network} %package daemon-config-network Summary: Default configuration files for the libvirtd daemon -Group: Development/Libraries +Group: Development/Libraries/C and C++ Requires: libvirt-daemon = %{version}-%{release} @@ -1189,6 +1189,10 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml # Strip auto-generated UUID - we need it generated per-install sed -i -e "//d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml +cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-config-network.README << 'EOF' +Any empty package containing only a post install scriptlet that ensures +a default network is defined. +EOF %else rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml @@ -1343,7 +1347,7 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; < %{_datadir}/libvirt/networks/default.xml \ > %{_sysconfdir}/libvirt/qemu/networks/default.xml fi - %endif +%endif %endif # with_libvirtd %post client @@ -1486,6 +1490,7 @@ fi %if %{with_network} %files daemon-config-network %defattr(-, root, root) +%doc %{_docdir}/%{name}/libvirt-daemon-config-network.README %endif %if %{with_nwfilter}