Dan Kenigsberg has uploaded a new change for review.

Change subject: Move safelease to its own sub-rpm ......................................................................

Move safelease to its own sub-rpm

I do not understand why rpm insists on marking vdsm-proper as architecture-dependent, when only (some of) its sub-rpms are.

Change-Id: Iaa9e841081cc6cfbc61ce003b902e7e7233dffb7 Signed-off-by: Dan Kenigsberg danken@redhat.com --- M vdsm.spec.in 1 file changed, 14 insertions(+), 3 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/19841/1

diff --git a/vdsm.spec.in b/vdsm.spec.in index e175ff8..c91e476 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -217,6 +217,7 @@ Requires: genisoimage Requires: libselinux-python Requires: %{name}-python = %{version}-%{release} +Requires: %{name}-safelease = %{version}-%{release} Requires: pyparted

Requires(post): /usr/sbin/saslpasswd2 @@ -335,6 +336,14 @@

%description tests A test suite for verifying the functionality of a running vdsm instance + +%package safelease +Summary: Maintain a lease on legacy master domains +Requires: vdsm = %{version}-%{release} + +%description safelease +Pre-sanlock means to hold the SPM lease on a master domain. It is still +required as long as we support version 0 storage domains.

%package hook-checkimages Summary: Qcow2 disk image format check hook for VDSM @@ -918,9 +927,6 @@ %{_datadir}/%{vdsm_name}/storage/volume.py* %{_datadir}/%{vdsm_name}/storage/imageRepository/__init__.py* %{_datadir}/%{vdsm_name}/storage/imageRepository/formatConverter.py* -%{_libexecdir}/%{vdsm_name}/safelease -%{_libexecdir}/%{vdsm_name}/spmprotect.sh -%{_libexecdir}/%{vdsm_name}/spmstop.sh %dir %{_libexecdir}/%{vdsm_name}/hooks/before_device_create %dir %{_libexecdir}/%{vdsm_name}/hooks/after_device_create %dir %{_libexecdir}/%{vdsm_name}/hooks/before_device_destroy @@ -1080,6 +1086,11 @@ %{_datadir}/%{vdsm_name}/tests/functional/*.py* %{_datadir}/%{vdsm_name}/tests/functional/*.policy

+%files safelease +%{_libexecdir}/%{vdsm_name}/safelease +%{_libexecdir}/%{vdsm_name}/spmprotect.sh +%{_libexecdir}/%{vdsm_name}/spmstop.sh + %files hook-openstacknet %defattr(-, root, root, -) %{_sysconfdir}/sudoers.d/50_vdsm_hook_openstacknet