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

spec: fix rpm build when lxc disabled

Browse Source 
'make rpm' failed if ~/.rpmmacros contains '%_without_lxc 1',
which simulates the case of not having lxc available.

RPM build errors:
    File not found: /home/eblake/rpmbuild/BUILDROOT/libvirt-1.1.1-1.fc19.x86_64/etc/libvirt/virt-login-shell.conf
    File not found by glob: /home/eblake/rpmbuild/BUILDROOT/libvirt-1.1.1-1.fc19.x86_64/usr/share/man/man1/virt-login-shell.1*
    File not found: /home/eblake/rpmbuild/BUILDROOT/libvirt-1.1.1-1.fc19.x86_64/usr/bin/virt-login-shell
make: *** [rpm] Error 1

Reported by Dan Berrange.

* libvirt.spec.in: Mark virt-login-shell as conditional on lxc.

Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit d42906fd004dc4cda34c1d2d4b4c18fce213ede2)
This commit is contained in:
Eric Blake 2013-09-03 15:10:01 -06:00 committed by Daniel P. Berrange
parent 050c432d1a
commit 0a25677126
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libvirt.spec.in
View File

@ -2013,17 +2013,23 @@ fi
%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO %doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO
%config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf
%if %{with_lxc}
%config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf %config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
%endif
%{_mandir}/man1/virsh.1* %{_mandir}/man1/virsh.1*
%{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-xml-validate.1*
%{_mandir}/man1/virt-pki-validate.1* %{_mandir}/man1/virt-pki-validate.1*
%{_mandir}/man1/virt-host-validate.1* %{_mandir}/man1/virt-host-validate.1*
%if %{with_lxc}
%{_mandir}/man1/virt-login-shell.1* %{_mandir}/man1/virt-login-shell.1*
%endif
%{_bindir}/virsh %{_bindir}/virsh
%{_bindir}/virt-xml-validate %{_bindir}/virt-xml-validate
%{_bindir}/virt-pki-validate %{_bindir}/virt-pki-validate
%{_bindir}/virt-host-validate %{_bindir}/virt-host-validate
%if %{with_lxc}
%attr(4755, root, root) %{_bindir}/virt-login-shell %attr(4755, root, root) %{_bindir}/virt-login-shell
%endif
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%if %{with_dtrace} %if %{with_dtrace}