[vdsm] vdsm-4.16.5-20.gita40634a

[Douglas Schilling Landgraf]

commit 8da15110f573c77971a258e9ff0d840c14b44518
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date:   Wed Oct 1 21:21:22 2014 -0400

    vdsm-4.16.5-20.gita40634a

 sources   |    2 +-
 vdsm.spec |   19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 5513cee..2af5355 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b750b144d7291dde53ccf21d90ba82bf  vdsm-4.16.5.tar.gz
+4edc9253ddcb80aa4fbf10969c239417  vdsm-4.16.5.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index d740f91..6171168 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -41,6 +41,10 @@
 %global with_vhostmd 1
 %endif
 
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%global with_chcon_hack 1
+%endif
+
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
 %global with_systemd 1
 %endif
@@ -52,13 +56,15 @@
 
 %if 0%{?rhel} == 6
 %global _udevrulesdir /lib/udev/rules.d/
+%global _udevexecdir /lib/udev/
 %else
 %global _udevrulesdir /usr/lib/udev/rules.d/
+%global _udevexecdir /usr/lib/udev/
 %endif
 
 Name:           %{vdsm_name}
 Version:        4.16.5
-Release:        5.gitb16b036%{?dist}%{?extra_release}
+Release:        20.gita40634a%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -361,7 +367,6 @@ Requires:       %{name}-python-zombiereaper = %{version}-%{release}
 Requires:       python-cpopen >= 1.2.3-5
 Requires:       m2crypto
 Requires:       python-ioprocess >= 0.12
-BuildArch:      noarch
 
 %description python
 Shared libraries between the various VDSM packages.
@@ -651,7 +656,7 @@ sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
 %if 0%{?enable_autotools}
 autoreconf -if
 %endif
-%configure %{?with_hooks:--enable-hooks}
+%configure %{?with_hooks:--enable-hooks} %{?with_chcon_hack:--enable-chcon-hack}
 make
 # Setting software_version and software_revision in dsaversion.py
 baserelease=`echo "%{release}" | sed 's/\([0-9]\+\(\.[0-9]\+\)\?\).*/\1/'`
@@ -678,6 +683,11 @@ install -Dm 0755 init/sysvinit/respawn \
 install -Dm 0644 vdsm/storage/vdsm-lvm.rules \
                  %{buildroot}%{_udevrulesdir}/12-vdsm-lvm.rules
 
+%if 0%{?with_chcon_hack}
+install -Dm 0755 vdsm/storage/vdsm-chcon \
+                 %{buildroot}%{_udevexecdir}/vdsm-chcon
+%endif
+
 install -Dm 0644 vdsm/limits.conf \
                  %{buildroot}/etc/security/limits.d/99-vdsm.conf
 
@@ -1156,6 +1166,9 @@ exit 0
 %endif
 %{python_sitelib}/sos/plugins/vdsm.py*
 %{_udevrulesdir}/12-vdsm-lvm.rules
+%if 0%{?with_chcon_hack}
+%{_udevexecdir}/vdsm-chcon
+%endif
 /etc/security/limits.d/99-vdsm.conf
 %{_mandir}/man8/vdsmd.8*
 %if 0%{?rhel}