While sarting to build the RPMs for Fedora I noticed that there
were a couple of cleanup patches missing about the handling of
configuration files, and we forgot to add the dependancy on
hal/hal-devel. We should also probably list hal and devkit support
as modular options in the spec too. But this patch is just to
harmonize with Fedora,
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel@xxxxxxxxxxxx | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
--- /u/veillard/libvirt/libvirt.spec 2008-11-26 09:45:09.000000000 +0100
+++ libvirt.spec 2008-11-26 09:46:28.000000000 +0100
@@ -48,6 +48,8 @@ Requires: ncurses
Requires: dnsmasq
Requires: bridge-utils
Requires: iptables
+# needed for device enumeration
+Requires: hal
# So remote clients can access libvirt over SSH tunnel
# (client invokes 'nc' against the UNIX socket on the server)
Requires: nc
@@ -89,6 +91,7 @@ BuildRequires: readline-devel
BuildRequires: ncurses-devel
BuildRequires: gettext
BuildRequires: gnutls-devel
+BuildRequires: hal-devel
%if %{with_avahi}
BuildRequires: avahi-devel
%endif
@@ -244,6 +247,11 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libv
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
+%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
%find_lang %{name}
@@ -262,6 +270,7 @@ rm -fr %{buildroot}
/sbin/ldconfig
%if %{with_libvirtd}
+%if %{with_qemu}
# We want to install the default network for initial RPM installs
# 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
@@ -274,6 +283,7 @@ then
> %{_sysconfdir}/libvirt/qemu/networks/default.xml
ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
fi
+%endif
/sbin/chkconfig --add libvirtd
%endif
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list