rpms/libvirt/devel libvirt.spec,1.97,1.98
Daniel Veillard
veillard at fedoraproject.org
Wed Sep 24 07:10:41 UTC 2008
Author: veillard
Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6739
Modified Files:
libvirt.spec
Log Message:
Fix a build failure in ppc64 for unpackaged file since without_qemu
Daniel
Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- libvirt.spec 23 Sep 2008 21:25:17 -0000 1.97
+++ libvirt.spec 24 Sep 2008 07:10:11 -0000 1.98
@@ -238,6 +238,11 @@
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}
@@ -256,6 +261,7 @@
/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
@@ -268,6 +274,7 @@
> %{_sysconfdir}/libvirt/qemu/networks/default.xml
ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
fi
+%endif
/sbin/chkconfig --add libvirtd
%endif
More information about the fedora-extras-commits
mailing list