[vdsm] vdsm tag 4.16.5-5
Douglas Schilling Landgraf
dougsland at fedoraproject.org
Sun Sep 28 22:05:29 UTC 2014
commit 194beb78d4c5c2150d64a9dbdbdcba3a0f8d02d9
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date: Sun Sep 28 18:05:10 2014 -0400
vdsm tag 4.16.5-5
sources | 2 +-
vdsm.spec | 71 ++++++++++++++++++++++++++++++++++++++++++++----------------
2 files changed, 53 insertions(+), 20 deletions(-)
---
diff --git a/sources b/sources
index f40d509..5513cee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-434579d3fc056b5ccb93586c8817c826 vdsm-4.16.4.tar.gz
+b750b144d7291dde53ccf21d90ba82bf vdsm-4.16.5.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index dd9223b..d740f91 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -57,8 +57,8 @@
%endif
Name: %{vdsm_name}
-Version: 4.16.4
-Release: 0%{?dist}%{?extra_release}
+Version: 4.16.5
+Release: 5.gitb16b036%{?dist}%{?extra_release}
Summary: Virtual Desktop Server Manager
Group: Applications/System
@@ -75,7 +75,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 +147,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 +194,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 +213,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 +228,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
@@ -290,10 +306,11 @@ ovirt-engine and vdsClient.
Summary: VDSM API Server
BuildArch: noarch
-Requires: %{name}-python = %{version}-%{release}
-Requires: %{name}-yajsonrpc = %{version}-%{release}
+Requires: %{name}-python = %{version}-%{release}
+Requires: %{name}-yajsonrpc = %{version}-%{release}
+Obsoletes: vdsm-api < 4.16
%if 0%{?rhel} == 6
-Requires: python-ordereddict
+Requires: python-ordereddict
%endif
%description jsonrpc
@@ -703,6 +720,12 @@ install -Dm 0644 vdsm/vdsm-libvirt-access.pkla \
%{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.pkla
%endif
+# Install the libvirt hook for cleaning up the XML
+%if 0%{?fedora} || 0%{?rhel} >= 7
+install -Dm 0755 vdsm/virt/libvirt-hook.sh \
+ %{buildroot}%{_sysconfdir}/libvirt/hooks/qemu
+%endif
+
%check
# Disabling the nose tests until they'll all succeed in koji.
# make check is failing on F-18+ due to pep8 issues. See RHBZ # 837014
@@ -986,6 +1009,9 @@ exit 0
%{_sysconfdir}/sudoers.d/50_vdsm
%{_sysconfdir}/cron.hourly/vdsm-logrotate
%{_sysconfdir}/cron.d/vdsm-libvirt-logrotate
+%if 0%{?fedora} || 0%{?rhel} >= 7
+%{_sysconfdir}/libvirt/hooks/qemu
+%endif
%{_datadir}/%{vdsm_name}/logUtils.py*
%{_datadir}/%{vdsm_name}/dsaversion.py*
%{_libexecdir}/%{vdsm_name}/curl-img-wrap
@@ -1264,6 +1290,12 @@ exit 0
%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_openstacknet
%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/openstacknet_utils.py*
+%files hook-macspoof
+%defattr(-, root, root, -)
+%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_macspoof
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_macspoof
+%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_macspoof
+
%if 0%{?with_vhostmd}
%files hook-vhostmd
%defattr(-, root, root, -)
@@ -1338,12 +1370,6 @@ exit 0
%defattr(-, root, root, -)
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_macbind
-%files hook-macspoof
-%defattr(-, root, root, -)
-%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_macspoof
-%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_macspoof
-%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_macspoof
-
%files hook-extnet
%defattr(-, root, root, -)
%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_extnet
@@ -1437,6 +1463,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
@@ -1496,7 +1525,8 @@ exit 0
%dir %{_datadir}/%{vdsm_name}/gluster
%doc COPYING
%{_datadir}/%{vdsm_name}/gluster/api.py*
-%{_datadir}/%{vdsm_name}/gluster/vdsmapi-gluster-schema.json
+%{_datadir}/%{vdsm_name}/gluster/apiwrapper.py*
+%{_datadir}/%{vdsm_name}/rpc/vdsmapi-gluster-schema.json
%{_datadir}/%{vdsm_name}/gluster/gfapi.py*
%{_datadir}/%{vdsm_name}/gluster/hooks.py*
%{_datadir}/%{vdsm_name}/gluster/services.py*
@@ -1504,6 +1534,9 @@ exit 0
%endif
%changelog
+* 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