diff options
author | 2012-03-31 12:55:41 +0100 | |
---|---|---|
committer | 2012-03-31 13:22:40 +0100 | |
commit | 8bf0442e833f93b88c0615bece90151041aaa0d4 (patch) | |
tree | c3f09f7ef6bb0c826ad04fe81ceae3469d87727d /libvirt.spec.in | |
parent | Refactor the libvirt RPM daemon pieces (diff) | |
download | libvirt-8bf0442e833f93b88c0615bece90151041aaa0d4.tar.gz libvirt-8bf0442e833f93b88c0615bece90151041aaa0d4.tar.bz2 libvirt-8bf0442e833f93b88c0615bece90151041aaa0d4.zip |
Fix client only RPM build & other misc RPM problems
* libvirt.spec.in: Remove obsolete --with-remote-pid-file arg.
Add missing %{without_libxl} statement. Fix handling of docs
in client only build. Put systemtap files in -client RPM
instead of -daemon RPM
* examples/xml/nwfilter/Makefile.am: Don't install examples if
nwfilter is disabled.
Diffstat (limited to 'libvirt.spec.in')
-rw-r--r-- | libvirt.spec.in | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/libvirt.spec.in b/libvirt.spec.in index d91653cd7..b787fde17 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -973,6 +973,7 @@ autoreconf -if %{?_without_openvz} \ %{?_without_lxc} \ %{?_without_vbox} \ + %{?_without_libxl} \ %{?_without_xenapi} \ %{?_without_sasl} \ %{?_without_avahi} \ @@ -1008,8 +1009,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 @@ -1059,16 +1059,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 @@ -1081,11 +1071,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml %endif -mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} - -%if ! %{with_nwfilter} -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter -%endif +mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} \ + $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} %clean rm -fr %{buildroot} @@ -1305,10 +1292,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/ @@ -1495,6 +1478,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/ |