From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 17 Oct 2013 13:18:18 +0000 (+0100)
Subject: Move virt-login-shell into libvirt-login-shell sub-RPM
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=908efd3ec9f6856cc905f7d88122a3291057ce40;p=thirdparty%2Flibvirt.git

Move virt-login-shell into libvirt-login-shell sub-RPM

Many people will not want the setuid virt-login-shell binary
installed by default, so move it into a separate sub-RPM
named libvirt-login-shell. This RPM is only generated if
LXC is enabled

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit 8adc92694fecbd35f28cf236edff14509bf4eaf4)
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index cf94d6eaf8..6c82e2ea1c 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1106,6 +1106,18 @@ Requires: cyrus-sasl-md5
 Shared libraries and client binaries needed to access to the
 virtualization capabilities of recent versions of Linux (and other OSes).
 
+%if %{with_lxc}
+%package login-shell
+Summary: Login shell for connecting users to an LXC container
+Group: Development/Libraries
+Requires: %{name}-client = %{version}-%{release}
+
+%description login-shell
+Provides the set-uid virt-login-shell binary that is used to
+connect a user to an LXC container when they login, by switching
+namespaces.
+%endif
+
 %package devel
 Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
@@ -2013,23 +2025,14 @@ fi
 %doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO
 
 %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf
-%if %{with_lxc}
-%config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
-%endif
 %{_mandir}/man1/virsh.1*
 %{_mandir}/man1/virt-xml-validate.1*
 %{_mandir}/man1/virt-pki-validate.1*
 %{_mandir}/man1/virt-host-validate.1*
-%if %{with_lxc}
-%{_mandir}/man1/virt-login-shell.1*
-%endif
 %{_bindir}/virsh
 %{_bindir}/virt-xml-validate
 %{_bindir}/virt-pki-validate
 %{_bindir}/virt-host-validate
-%if %{with_lxc}
-%attr(4755, root, root) %{_bindir}/virt-login-shell
-%endif
 %{_libdir}/lib*.so.*
 
 %if %{with_dtrace}
@@ -2073,6 +2076,13 @@ fi
 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 %endif
 
+%if %{with_lxc}
+%files login-shell
+%attr(4755, root, root) %{_bindir}/virt-login-shell
+%config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
+%{_mandir}/man1/virt-login-shell.1*
+%endif
+
 %files devel
 %defattr(-, root, root)