[libvirt] Fix client only RPM build & other misc RPM problems
Daniel P. Berrange
berrange at fedoraproject.org
Wed Apr 4 11:03:27 UTC 2012
commit 6763b267b9d1d38b87053c8b7cc642147fa3ff0e
Author: Daniel P. Berrange <berrange at redhat.com>
Date: Wed Apr 4 11:39:42 2012 +0100
Fix client only RPM build & other misc RPM problems
libvirt.spec | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/libvirt.spec b/libvirt.spec
index 550f8b1..b4a9b44 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -776,6 +776,7 @@ autoreconf -if
%{?_without_openvz} \
%{?_without_lxc} \
%{?_without_vbox} \
+ %{?_without_libxl} \
%{?_without_xenapi} \
%{?_without_sasl} \
%{?_without_avahi} \
@@ -811,8 +812,7 @@ autoreconf -if
%{with_packager_version} \
--with-qemu-user=%{qemu_user} \
--with-qemu-group=%{qemu_group} \
- %{init_scripts} \
- --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid
+ %{init_scripts}
make %{?_smp_mflags}
gzip -9 ChangeLog
@@ -862,16 +862,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}
%endif
-%if %{client_only}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}
-%endif
-
-%if ! %{with_libvirtd}
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter
-mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}/html \
- $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-devel-%{version}/
-%endif
-
%if ! %{with_qemu}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu
@@ -1092,10 +1082,6 @@ fi
%else
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
%endif
-%if %{with_dtrace}
-%{_datadir}/systemtap/tapset/libvirt_probes.stp
-%{_datadir}/systemtap/tapset/libvirt_functions.stp
-%endif
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/
@@ -1221,6 +1207,11 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
%{_bindir}/virt-host-validate
%{_libdir}/lib*.so.*
+%if %{with_dtrace}
+%{_datadir}/systemtap/tapset/libvirt_probes.stp
+%{_datadir}/systemtap/tapset/libvirt_functions.stp
+%endif
+
%dir %{_datadir}/libvirt/
%dir %{_datadir}/libvirt/schemas/
More information about the scm-commits
mailing list