External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-30 11:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

* libvirt.spec.in: cleanups and missing dep for hal

Browse Source 
Daniel
This commit is contained in:
Daniel Veillard 2008-11-26 14:46:49 +00:00
parent 517ff04bec
commit 60c8b285a6
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Nov 26 15:46:07 CET 2008 Daniel Veillard <veillard@redhat.com>
* libvirt.spec.in: cleanups and missing dep for hal
Tue Nov 25 16:29:09 CET 2008 Daniel Veillard <veillard@redhat.com> Tue Nov 25 16:29:09 CET 2008 Daniel Veillard <veillard@redhat.com>
* configure.in docs/* NEWS: release of 0.5.0 * configure.in docs/* NEWS: release of 0.5.0

10
libvirt.spec.in
View File

@ -48,6 +48,8 @@ Requires: ncurses
Requires: dnsmasq Requires: dnsmasq
Requires: bridge-utils Requires: bridge-utils
Requires: iptables Requires: iptables
# needed for device enumeration
Requires: hal
# So remote clients can access libvirt over SSH tunnel # So remote clients can access libvirt over SSH tunnel
# (client invokes 'nc' against the UNIX socket on the server) # (client invokes 'nc' against the UNIX socket on the server)
Requires: nc Requires: nc
@ -89,6 +91,7 @@ BuildRequires: readline-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: gettext BuildRequires: gettext
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
BuildRequires: hal-devel
%if %{with_avahi} %if %{with_avahi}
BuildRequires: avahi-devel BuildRequires: avahi-devel
%endif %endif
@ -244,6 +247,11 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
# Strip auto-generated UUID - we need it generated per-install # Strip auto-generated UUID - we need it generated per-install
sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
%else
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
%endif %endif
%find_lang %{name} %find_lang %{name}
@ -262,6 +270,7 @@ rm -fr %{buildroot}
/sbin/ldconfig /sbin/ldconfig
%if %{with_libvirtd} %if %{with_libvirtd}
%if %{with_qemu}
# We want to install the default network for initial RPM installs # We want to install the default network for initial RPM installs
# or on the first upgrade from a non-network aware libvirt only. # or on the first upgrade from a non-network aware libvirt only.
# We check this by looking to see if the daemon is already installed # We check this by looking to see if the daemon is already installed
@ -274,6 +283,7 @@ then
> %{_sysconfdir}/libvirt/qemu/networks/default.xml > %{_sysconfdir}/libvirt/qemu/networks/default.xml
ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
fi fi
%endif
/sbin/chkconfig --add libvirtd /sbin/chkconfig --add libvirtd
%endif %endif