[vdsm/f20] Vdsm 4.16.7 - oVirt 3.5 stable

Yaniv Bronhaim bronhaim at fedoraproject.org
Sun Oct 12 11:16:57 UTC 2014 

commit d8c3dbc41ce450f4d4b791b469fef8e54dad619d
Author: Yaniv Bronhaim <ybronhei at redhat.com>
Date:   Sun Oct 12 14:16:31 2014 +0300

    Vdsm 4.16.7 - oVirt 3.5 stable

 sources   |    2 +-
 vdsm.spec |  140 ++++++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 89 insertions(+), 53 deletions(-)
---
diff --git a/sources b/sources
index bf318a0..aa9f92c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-111a80f3aae985aa520d8ac1612a5053  vdsm-4.16.5.tar.gz
+d2e7b4ad6e78980b8aa3da6afd4ca71a  vdsm-4.16.7.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index 353e12a..fb73578 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:        0%{?dist}%{?extra_release}
+Version:        4.16.7
+Release:        1.gitdb83943%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -75,7 +81,10 @@ Source0:        %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if !%{fedora_koji_build}
 ExclusiveArch: x86_64 ppc64
+%endif
+
 BuildRequires: gcc
 BuildRequires: python
 BuildRequires: python-devel
@@ -144,7 +153,10 @@ Requires: libnl
 Requires: %{name}-xmlrpc = %{version}-%{release}
 Requires: %{name}-jsonrpc = %{version}-%{release}
 Requires: mom >= 0.4.1
+# Numactl is not available on s390[x] and ARM
+%ifnarch s390 s390x %{arm}
 Requires: numactl
+%endif
 
 %ifarch x86_64
 Requires: python-dmidecode
@@ -188,14 +200,9 @@ Requires: fence-agents-all
 Requires: lvm2
 Requires: python
 Requires: policycoreutils-python
-Requires: qemu-kvm-rhev
-Requires: qemu-img-rhev
 Requires: selinux-policy-targeted
 %else
 Requires: python
-# Update the qemu-kvm-rhev requires when block_stream will be included
-Requires: qemu-kvm-rhev >= 2:0.12.1.2-2.415.el6_5.3
-Requires: qemu-img-rhev >= 2:0.12.1.2-2.415.el6_5.3
 Requires: device-mapper-multipath >= 0.4.9-52
 Requires: e2fsprogs >= 1.41.12-11
 Requires: fence-agents
@@ -212,8 +219,6 @@ Requires: fence-agents-all
 Requires: kernel >= 3.11.3-201
 # Subprocess and thread bug was found on python 2.7.2
 Requires: python >= 2.7.3
-Requires: qemu-kvm >= 2:0.15.0-4
-Requires: qemu-img >= 2:0.15.0-4
 Requires: python-ethtool >= 0.8-1
 Requires: initscripts >= 9.42.2-1
 Requires: device-mapper-multipath >= 0.4.9-18
@@ -229,6 +234,23 @@ Requires: policycoreutils >= 2.1.13-55
 Requires: systemd >= 197-1.fc18.2
 %endif
 
+%if !%{fedora_koji_build}
+%global rhev_suffix -rhev
+%endif
+
+%if 0%{?rhel}
+%if 0%{?rhel} >= 7
+Requires: qemu-kvm%{?rhev_suffix}
+Requires: qemu-img%{?rhev_suffix}
+%else
+Requires: qemu-kvm%{?rhev_suffix} >= 2:0.12.1.2-2.415.el6_5.3
+Requires: qemu-img%{?rhev_suffix} >= 2:0.12.1.2-2.415.el6_5.3
+%endif
+%else
+Requires: qemu-kvm >= 2:0.15.0-4
+Requires: qemu-img >= 2:0.15.0-4
+%endif
+
 # GlusterFS client-side RPMs needed for Gluster SD
 %if 0%{?with_gluster}
 Requires: glusterfs >= 3.4.2
@@ -635,7 +657,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/'`
@@ -662,6 +684,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
 
@@ -1140,6 +1167,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}
@@ -1175,49 +1205,49 @@ exit 0
 %defattr(-, root, root, -)
 %{_mandir}/man1/vdsm-tool.1*
 %{_bindir}/vdsm-tool
-%dir %{python_sitearch}/%{vdsm_name}
-%dir %{python_sitearch}/%{vdsm_name}/tool
-%{python_sitearch}/%{vdsm_name}/__init__.py*
-%{python_sitearch}/%{vdsm_name}/compat.py*
-%{python_sitearch}/%{vdsm_name}/config.py*
-%{python_sitearch}/%{vdsm_name}/constants.py*
-%{python_sitearch}/%{vdsm_name}/define.py*
-%{python_sitearch}/%{vdsm_name}/exception.py*
-%{python_sitearch}/%{vdsm_name}/ipwrapper.py*
-%{python_sitearch}/%{vdsm_name}/libvirtconnection.py*
-%{python_sitearch}/%{vdsm_name}/netinfo.py*
-%{python_sitearch}/%{vdsm_name}/netlink.py*
-%{python_sitearch}/%{vdsm_name}/profile.py*
-%{python_sitearch}/%{vdsm_name}/qemuimg.py*
-%{python_sitearch}/%{vdsm_name}/SecureXMLRPCServer.py*
-%{python_sitearch}/%{vdsm_name}/netconfpersistence.py*
-%{python_sitearch}/%{vdsm_name}/sslutils.py*
-%{python_sitearch}/%{vdsm_name}/utils.py*
-%{python_sitearch}/%{vdsm_name}/vdscli.py*
-%{python_sitearch}/%{vdsm_name}/tool/__init__.py*
+%dir %{python_sitelib}/%{vdsm_name}
+%dir %{python_sitelib}/%{vdsm_name}/tool
+%{python_sitelib}/%{vdsm_name}/__init__.py*
+%{python_sitelib}/%{vdsm_name}/compat.py*
+%{python_sitelib}/%{vdsm_name}/config.py*
+%{python_sitelib}/%{vdsm_name}/constants.py*
+%{python_sitelib}/%{vdsm_name}/define.py*
+%{python_sitelib}/%{vdsm_name}/exception.py*
+%{python_sitelib}/%{vdsm_name}/ipwrapper.py*
+%{python_sitelib}/%{vdsm_name}/libvirtconnection.py*
+%{python_sitelib}/%{vdsm_name}/netinfo.py*
+%{python_sitelib}/%{vdsm_name}/netlink.py*
+%{python_sitelib}/%{vdsm_name}/profile.py*
+%{python_sitelib}/%{vdsm_name}/qemuimg.py*
+%{python_sitelib}/%{vdsm_name}/SecureXMLRPCServer.py*
+%{python_sitelib}/%{vdsm_name}/netconfpersistence.py*
+%{python_sitelib}/%{vdsm_name}/sslutils.py*
+%{python_sitelib}/%{vdsm_name}/utils.py*
+%{python_sitelib}/%{vdsm_name}/vdscli.py*
+%{python_sitelib}/%{vdsm_name}/tool/__init__.py*
 %if 0%{?with_systemd}
-%exclude %{python_sitearch}/%{vdsm_name}/tool/load_needed_modules.py*
+%exclude %{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py*
 %else
-%{python_sitearch}/%{vdsm_name}/tool/load_needed_modules.py*
+%{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py*
 %endif
-%{python_sitearch}/%{vdsm_name}/tool/dummybr.py*
-%{python_sitearch}/%{vdsm_name}/tool/nwfilter.py*
-%{python_sitearch}/%{vdsm_name}/tool/configurator.py*
-%{python_sitearch}/%{vdsm_name}/tool/configurators/__init__*
-%{python_sitearch}/%{vdsm_name}/tool/configurators/configfile.py*
-%{python_sitearch}/%{vdsm_name}/tool/configurators/certificates.py*
-%{python_sitearch}/%{vdsm_name}/tool/configurators/libvirt.py*
-%{python_sitearch}/%{vdsm_name}/tool/configurators/sanlock.py*
-%{python_sitearch}/%{vdsm_name}/tool/passwd.py*
-%{python_sitearch}/%{vdsm_name}/tool/restore_nets.py*
-%{python_sitearch}/%{vdsm_name}/tool/seboolsetup.py*
-%{python_sitearch}/%{vdsm_name}/tool/service.py*
-%{python_sitearch}/%{vdsm_name}/tool/transient.py*
-%{python_sitearch}/%{vdsm_name}/tool/unified_persistence.py*
-%{python_sitearch}/%{vdsm_name}/tool/upgrade.py*
-%{python_sitearch}/%{vdsm_name}/tool/upgrade_300_networks.py*
-%{python_sitearch}/%{vdsm_name}/tool/validate_ovirt_certs.py*
-%{python_sitearch}/%{vdsm_name}/tool/vdsm-id.py*
+%{python_sitelib}/%{vdsm_name}/tool/dummybr.py*
+%{python_sitelib}/%{vdsm_name}/tool/nwfilter.py*
+%{python_sitelib}/%{vdsm_name}/tool/configurator.py*
+%{python_sitelib}/%{vdsm_name}/tool/configurators/__init__*
+%{python_sitelib}/%{vdsm_name}/tool/configurators/configfile.py*
+%{python_sitelib}/%{vdsm_name}/tool/configurators/certificates.py*
+%{python_sitelib}/%{vdsm_name}/tool/configurators/libvirt.py*
+%{python_sitelib}/%{vdsm_name}/tool/configurators/sanlock.py*
+%{python_sitelib}/%{vdsm_name}/tool/passwd.py*
+%{python_sitelib}/%{vdsm_name}/tool/restore_nets.py*
+%{python_sitelib}/%{vdsm_name}/tool/seboolsetup.py*
+%{python_sitelib}/%{vdsm_name}/tool/service.py*
+%{python_sitelib}/%{vdsm_name}/tool/transient.py*
+%{python_sitelib}/%{vdsm_name}/tool/unified_persistence.py*
+%{python_sitelib}/%{vdsm_name}/tool/upgrade.py*
+%{python_sitelib}/%{vdsm_name}/tool/upgrade_300_networks.py*
+%{python_sitelib}/%{vdsm_name}/tool/validate_ovirt_certs.py*
+%{python_sitelib}/%{vdsm_name}/tool/vdsm-id.py*
 
 %files tests
 %doc %{_datadir}/%{vdsm_name}/tests/README
@@ -1447,6 +1477,9 @@ exit 0
 %{_datadir}/%{vdsm_name}/rpc/vdsmapi-schema.json
 %{python_sitelib}/vdsmapi.py*
 %{python_sitelib}/yajsonrpc/__init__.py*
+%if ! 0%{?with_gluster}
+%exclude %{_datadir}/%{vdsm_name}/rpc/vdsmapi-gluster-schema.json
+%endif
 
 %files yajsonrpc
 %dir %{python_sitelib}/yajsonrpc
@@ -1515,8 +1548,11 @@ exit 0
 %endif
 
 %changelog
-* Mon Sep 22 2014 Yaniv Bronhaim <ybronhei at redhat.com> - 4.16.5
-- vdsm tag 4.16.5 for ovirt 3.5.0 RC3
+* Wed Oct 8 2014 Yaniv Bronhaim <ybronhei at redhat.com> - 4.16.7
+- vdsm tag 4.16.7
+
+* Sun Sep 28 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.16.5-5
+- vdsm tag 4.16.5-5
 
 * Wed Sep 10 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.16.4-0
 - vdsm tag 4.16.4

More information about the scm-commits mailing list