- Fix build on code 11

- Fix rpmlint warning

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=344
This commit is contained in:
James Fehlig 2014-01-21 01:24:00 +00:00 committed by Git OBS Bridge
parent db81eba56f
commit 629e5aaef7
2 changed files with 13 additions and 2 deletions

View File

@ -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

View File

@ -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 "/<uuid>/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}