External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 03:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix client only RPM build & other misc RPM problems

Browse Source 
* 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.
This commit is contained in:
Daniel P. Berrange 2012-03-31 12:55:41 +01:00
parent 06a0d57f5a
commit 8bf0442e83
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/xml/nwfilter/Makefile.am
View File

@ -22,6 +22,7 @@ FILTERS = \
EXTRA_DIST=$(FILTERS) EXTRA_DIST=$(FILTERS)
if WITH_NWFILTER
confdir = $(sysconfdir)/libvirt confdir = $(sysconfdir)/libvirt
NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter" NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter"
@ -37,3 +38,4 @@ uninstall-local::
rm -f "$(NWFILTER_DIR)/$$f"; \ rm -f "$(NWFILTER_DIR)/$$f"; \
done done
-test -z $(shell ls $(NWFILTER_DIR)) || rmdir $(NWFILTER_DIR) -test -z $(shell ls $(NWFILTER_DIR)) || rmdir $(NWFILTER_DIR)
endif

30
libvirt.spec.in
View File

@ -973,6 +973,7 @@ autoreconf -if
%{?_without_openvz} \ %{?_without_openvz} \
%{?_without_lxc} \ %{?_without_lxc} \
%{?_without_vbox} \ %{?_without_vbox} \
%{?_without_libxl} \
%{?_without_xenapi} \ %{?_without_xenapi} \
%{?_without_sasl} \ %{?_without_sasl} \
%{?_without_avahi} \ %{?_without_avahi} \
@ -1008,8 +1009,7 @@ autoreconf -if
%{with_packager_version} \ %{with_packager_version} \
--with-qemu-user=%{qemu_user} \ --with-qemu-user=%{qemu_user} \
--with-qemu-group=%{qemu_group} \ --with-qemu-group=%{qemu_group} \
%{init_scripts} \ %{init_scripts}
--with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid
make %{?_smp_mflags} make %{?_smp_mflags}
gzip -9 ChangeLog 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} rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}
%endif %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} %if ! %{with_qemu}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu 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 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml
%endif %endif
mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} 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
%clean %clean
rm -fr %{buildroot} rm -fr %{buildroot}
@ -1305,10 +1292,6 @@ fi
%else %else
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
%endif %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/qemu/
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ %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 %{_bindir}/virt-host-validate
%{_libdir}/lib*.so.* %{_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/
%dir %{_datadir}/libvirt/schemas/ %dir %{_datadir}/libvirt/schemas/