From 67917429d2d819814874230b1268bb44d1fe14ac Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Jan 14 2013 00:20:16 +0000 Subject: vdsm.spec: v4.10.3-78-gb005b54 update v4.10.3-78-gb005b54 --- diff --git a/vdsm.spec b/vdsm.spec index dc0a536..82e86eb 100644 --- a/vdsm.spec +++ b/vdsm.spec @@ -4,9 +4,9 @@ %global vdsm_reg vdsm-reg # Upstream git release -# % global vdsm_release gf2f6683 -# % global vdsm_relvtag .git%{vdsm_release} -# % global vdsm_relttag -%{vdsm_release} +%global vdsm_release b005b54 +%global vdsm_relvtag .git%{vdsm_release} +%global vdsm_relttag -%{vdsm_release} # Required users and groups %global vdsm_user vdsm @@ -32,7 +32,7 @@ Name: %{vdsm_name} Version: 4.10.3 -Release: 1%{?vdsm_relvtag}%{?dist}%{?extra_release} +Release: 4%{?vdsm_relvtag}%{?dist}%{?extra_release} Summary: Virtual Desktop Server Manager Group: Applications/System @@ -55,12 +55,16 @@ BuildRequires: python-nose # BuildRequires needed by the tests during the build BuildRequires: python-ethtool +BuildRequires: python-pthreading BuildRequires: libselinux-python BuildRequires: libvirt-python BuildRequires: genisoimage BuildRequires: openssl BuildRequires: m2crypto -%if 0%{?rhel} +%ifarch x86_64 +BuildRequires: python-dmidecode +%endif +%if 0%{?rhel} == 6 BuildRequires: python-ordereddict %endif @@ -76,7 +80,6 @@ BuildRequires: libtool BuildRequires: pyflakes BuildRequires: python-pep8 BuildRequires: systemd-units -BuildRequires: python-pthreading %endif Requires: which @@ -85,7 +88,7 @@ Requires: logrotate Requires: xz Requires: ntp Requires: iproute -Requires: python-ethtool +Requires: python-ethtool >= 0.6-3 Requires: rpm-python Requires: nfs-utils Requires: python-pthreading @@ -93,6 +96,7 @@ Requires: m2crypto Requires: %{name}-xmlrpc = %{version}-%{release} %ifarch x86_64 +Requires: python-dmidecode Requires: dmidecode %endif @@ -114,7 +118,7 @@ Requires: python # Update the qemu-kvm requires when block_stream will be included Requires: qemu-kvm >= 2:0.12.1.2-2.295.el6_3.4 Requires: qemu-img >= 2:0.12.1.2-2.295.el6_3.4 -Requires: libvirt >= 0.9.10-21.el6_3.5 +Requires: libvirt >= 0.9.10-21.el6_3.6 Requires: iscsi-initiator-utils >= 6.2.0.872-15 Requires: device-mapper-multipath >= 0.4.9-52 Requires: e2fsprogs >= 1.41.12-11 @@ -122,7 +126,7 @@ Requires: kernel >= 2.6.32-279.9.1 Requires: sanlock >= 2.3-4, sanlock-python Requires: initscripts >= 9.03.31-2.el6_3.1 Requires: mom >= 0.3.0 -Requires: selinux-policy-targeted >= 3.7.19-80 +Requires: selinux-policy-targeted >= 3.7.19-155 Requires: lvm2 >= 2.02.95-10.el6_3.2 Requires: logrotate < 3.8.0 %endif @@ -143,6 +147,12 @@ Requires: selinux-policy-targeted >= 3.10.0-149 Requires: lvm2 >= 2.02.95 %endif +# In order to avoid a policycoreutils bug (rhbz 883355) when selinux is +# disabled we now require the version 2.1.13-44 (or newer) of Fedora. +%if 0%{?fedora} >= 18 +Requires: policycoreutils >= 2.1.13-44 +%endif + Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client Requires: psmisc >= 22.6-15 Requires: fence-agents @@ -192,7 +202,7 @@ Summary: VDSM API Server BuildArch: noarch Requires: %{name}-python = %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} == 6 Requires: python-ordereddict %endif @@ -321,11 +331,11 @@ If the nested virtualization is enabled in your kvm module this hook will expose it to the guests. %package hook-numa -Summary: numa sopport for VDSM +Summary: NUMA support for VDSM BuildArch: noarch %description hook-numa -Hooks is getting number/rage of numa nodes and numa mode, +Hooks is getting number/rage of NUMA nodes and NUMA mode, and update the VM xml. %package hook-pincpu @@ -371,14 +381,6 @@ Hook creates a disk for a VM onetime usage, the disk will be erased when the VM destroyed. VM cannot be migrated when using scratchpad hook -%package hook-smartcard -Summary: Smartcard support for Spice protocol in VDSM -BuildArch: noarch - -%description hook-smartcard -Smartcard hook add support for spice in VDSM. -Smartcard hook enable user to use its smartcard inside virtual machines. - %package hook-smbios Summary: Adding custom smbios entries to libvirt domain via VDSM BuildArch: noarch @@ -421,6 +423,7 @@ Gluster plugin enables VDSM to serve Gluster functionalities. %prep %setup -q + %if 0%{?rhel} == 6 sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in %endif @@ -502,7 +505,7 @@ export LC_ALL=C /usr/sbin/usermod -a -G %{qemu_group},%{vdsm_group} %{snlk_user} %post -%{_bindir}/vdsm-tool sebool-config +%{_bindir}/vdsm-tool sebool-config || : # set the vdsm "secret" password for libvirt %{_bindir}/vdsm-tool set-saslpasswd @@ -544,7 +547,7 @@ then /bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \ /etc/sysctl.conf - %{_bindir}/vdsm-tool sebool-unconfig + %{_bindir}/vdsm-tool sebool-unconfig || : /usr/sbin/saslpasswd2 -p -a libvirt -d vdsm@ovirt @@ -619,7 +622,7 @@ exit 0 %files %defattr(-, root, root, -) -%doc COPYING README vdsm/vdsm.conf.sample +%doc COPYING README vdsm/vdsm.conf.sample vdsm_api/vdsm-api.html %if 0%{?rhel} %{_initrddir}/vdsmd %else @@ -637,6 +640,7 @@ exit 0 %{_datadir}/%{vdsm_name}/blkid.py* %{_datadir}/%{vdsm_name}/caps.py* %{_datadir}/%{vdsm_name}/clientIF.py* +%{_datadir}/%{vdsm_name}/dmidecodeUtil.py* %{_datadir}/%{vdsm_name}/API.py* %{_datadir}/%{vdsm_name}/hooking.py* %{_datadir}/%{vdsm_name}/hooks.py* @@ -757,6 +761,11 @@ exit 0 %{_datadir}/%{vdsm_name}/neterrors.py* %{_datadir}/%{vdsm_name}/respawn %{_datadir}/%{vdsm_name}/set-conf-item +%dir %{_datadir}/%{vdsm_name}/gluster +%{_datadir}/%{vdsm_name}/gluster/__init__.py* +%{_datadir}/%{vdsm_name}/gluster/cli.py* +%{_datadir}/%{vdsm_name}/gluster/exception.py* +%{_datadir}/%{vdsm_name}/gluster/hostname.py* %{python_sitelib}/sos/plugins/vdsm.py* /lib/udev/rules.d/12-vdsm-lvm.rules /etc/security/limits.d/99-vdsm.conf @@ -823,6 +832,7 @@ exit 0 %{_datadir}/%{vdsm_name}/tests/netmaskconversions %{_datadir}/%{vdsm_name}/tests/run_tests.sh %{_datadir}/%{vdsm_name}/tests/route_info.out +%{_datadir}/%{vdsm_name}/tests/route_info_ppc64.out %{_datadir}/%{vdsm_name}/tests/tc_filter_show.out %{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfo.xml %{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfoNfs.xml @@ -907,10 +917,6 @@ exit 0 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_source/50_scratchpad %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_scratchpad -%files hook-smartcard -%defattr(-, root, root, -) -%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_smartcard - %files hook-smbios %defattr(-, root, root, -) %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_smbios @@ -1006,13 +1012,12 @@ exit 0 %defattr(-, root, root, -) %dir %{_datadir}/%{vdsm_name}/gluster %doc COPYING -%{_datadir}/%{vdsm_name}/gluster/__init__.py* %{_datadir}/%{vdsm_name}/gluster/api.py* -%{_datadir}/%{vdsm_name}/gluster/cli.py* -%{_datadir}/%{vdsm_name}/gluster/exception.py* -%{_datadir}/%{vdsm_name}/gluster/hostname.py* %changelog +* Sun Jan 13 2013 Douglas Schilling Landgraf v4.10.3-78-gb005b54 +* v4.10.3-78-gb005b54 + * Wed Dec 12 2012 Federico Simoncelli 4.10.3-1 - vdsm-4.10.3