[vdsm/f16] update to vdsm-4.9.2-951b41d

[Federico Simoncelli]

commit 6239658b8d08401e92ee80e6e69593a86e42f862
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Tue Jan 10 14:10:26 2012 -0500

    update to vdsm-4.9.2-951b41d

 vdsm.spec |   82 +++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 45 insertions(+), 37 deletions(-)
---
diff --git a/vdsm.spec b/vdsm.spec
index 90e27ff..cadbf9b 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -4,7 +4,7 @@
 %global vdsm_reg vdsm-reg
 
 # Upstream release
-%global vdsm_release 931a43e
+%global vdsm_release 951b41d
 
 # Required users and groups
 %global vdsm_user vdsm
@@ -15,25 +15,24 @@
 %global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d
 
 Name:           %{vdsm_name}
-Version:        4.9.1
-Release:        2.git%{vdsm_release}%{?dist}%{?extra_release}
+Version:        4.9.2
+Release:        0.git%{vdsm_release}%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
 License:        GPLv2+
-Url:            http://www.ovirt.org/project/subprojects
+Url:            http://www.ovirt.org/wiki/Vdsm
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
 #  git clone http://gerrit.ovirt.org/p/vdsm
 #  cd vdsm
 #  git reset --hard {vdsm_release}
 #  ./autogen.sh --system
-#  make VERSION=4.9.1-{vdsm_release} dist
+#  make VERSION={version}-{vdsm_release} dist
 Source0:        %{vdsm_name}-%{version}-%{vdsm_release}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python
-BuildRequires: redhat-rpm-config
 BuildRequires: pyflakes
 
 %if !0%{?rhel}
@@ -42,7 +41,7 @@ BuildRequires: systemd-units
 
 Requires: python which
 Requires: sudo >= 1.7.3
-Requires: logrotate
+Requires: logrotate >= 3.8.0
 Requires: xz
 Requires: python-ethtool
 Requires: nfs-utils dmidecode
@@ -70,6 +69,7 @@ Requires: psmisc >= 22.6-15
 Requires: fence-agents
 Requires: bridge-utils
 Requires: sos
+Requires: tree
 Requires: dosfstools
 Requires: policycoreutils-python
 Requires: libselinux-python
@@ -431,6 +431,7 @@ exit 0
 %{_unitdir}/vdsmd.service
 %config(noreplace) %{_sysconfdir}/%{vdsm_name}/vdsm.conf
 %endif
+%dir %attr(0775, root, root) /rhev/data-center
 %dir %{_libexecdir}/%{vdsm_name}
 %dir %{_datadir}/%{vdsm_name}
 %dir %{_datadir}/%{vdsm_name}/storage
@@ -468,42 +469,46 @@ exit 0
 %{_datadir}/%{vdsm_name}/betterThreading.py*
 %{_libexecdir}/%{vdsm_name}/persist-vdsm-hooks
 %{_libexecdir}/%{vdsm_name}/unpersist-vdsm-hook
+%{_libexecdir}/%{vdsm_name}/ovirt_functions.sh
 %{_datadir}/%{vdsm_name}/storage/__init__.py*
+%{_datadir}/%{vdsm_name}/storage/blockSD.py*
+%{_datadir}/%{vdsm_name}/storage/blockVolume.py*
+%{_datadir}/%{vdsm_name}/storage/devicemapper.py*
 %{_datadir}/%{vdsm_name}/storage/dispatcher.py*
-%{_datadir}/%{vdsm_name}/storage/storage_exception.py*
-%{_datadir}/%{vdsm_name}/storage/sp.py*
-%{_datadir}/%{vdsm_name}/storage/sd.py*
-%{_datadir}/%{vdsm_name}/storage/hsm.py*
+%{_datadir}/%{vdsm_name}/storage/domainMonitor.py*
+%{_datadir}/%{vdsm_name}/storage/fileSD.py*
+%{_datadir}/%{vdsm_name}/storage/fileUtils.py*
+%{_datadir}/%{vdsm_name}/storage/fileVolume.py*
+%{_datadir}/%{vdsm_name}/storage/fuser.py*
 %{_datadir}/%{vdsm_name}/storage/hba.py*
-%{_datadir}/%{vdsm_name}/storage/safelease.py*
+%{_datadir}/%{vdsm_name}/storage/hsm.py*
 %{_datadir}/%{vdsm_name}/storage/image.py*
-%{_datadir}/%{vdsm_name}/storage/fileSD.py*
-%{_datadir}/%{vdsm_name}/storage/nfsSD.py*
+%{_datadir}/%{vdsm_name}/storage/iscsi.py*
 %{_datadir}/%{vdsm_name}/storage/localFsSD.py*
-%{_datadir}/%{vdsm_name}/storage/blockSD.py*
-%{_datadir}/%{vdsm_name}/storage/volume.py*
-%{_datadir}/%{vdsm_name}/storage/fileVolume.py*
-%{_datadir}/%{vdsm_name}/storage/blockVolume.py*
-%{_datadir}/%{vdsm_name}/storage/taskManager.py*
-%{_datadir}/%{vdsm_name}/storage/threadPool.py*
-%{_datadir}/%{vdsm_name}/storage/task.py*
-%{_datadir}/%{vdsm_name}/storage/threadLocal.py*
-%{_datadir}/%{vdsm_name}/storage/resourceManager.py*
-%{_datadir}/%{vdsm_name}/storage/storage_connection.py*
-%{_datadir}/%{vdsm_name}/storage/storage_mailbox.py*
-%{_datadir}/%{vdsm_name}/storage/storageConstants.py*
-%{_datadir}/%{vdsm_name}/storage/fileUtils.py*
-%{_datadir}/%{vdsm_name}/storage/misc.py*
 %{_datadir}/%{vdsm_name}/storage/lvm.py*
-%{_datadir}/%{vdsm_name}/storage/resourceFactories.py*
+%{_datadir}/%{vdsm_name}/storage/misc.py*
+%{_datadir}/%{vdsm_name}/storage/mount.py*
+%{_datadir}/%{vdsm_name}/storage/multipath.py*
+%{_datadir}/%{vdsm_name}/storage/nfsSD.py*
 %{_datadir}/%{vdsm_name}/storage/outOfProcess.py*
+%{_datadir}/%{vdsm_name}/storage/persistentDict.py*
 %{_datadir}/%{vdsm_name}/storage/processPool.py*
-%{_datadir}/%{vdsm_name}/storage/iscsi.py*
-%{_datadir}/%{vdsm_name}/storage/devicemapper.py*
-%{_datadir}/%{vdsm_name}/storage/securable.py*
-%{_datadir}/%{vdsm_name}/storage/multipath.py*
+%{_datadir}/%{vdsm_name}/storage/resourceFactories.py*
+%{_datadir}/%{vdsm_name}/storage/resourceManager.py*
+%{_datadir}/%{vdsm_name}/storage/safelease.py*
 %{_datadir}/%{vdsm_name}/storage/sdc.py*
-%{_datadir}/%{vdsm_name}/storage/persistentDict.py*
+%{_datadir}/%{vdsm_name}/storage/sd.py*
+%{_datadir}/%{vdsm_name}/storage/securable.py*
+%{_datadir}/%{vdsm_name}/storage/sp.py*
+%{_datadir}/%{vdsm_name}/storage/storage_connection.py*
+%{_datadir}/%{vdsm_name}/storage/storageConstants.py*
+%{_datadir}/%{vdsm_name}/storage/storage_exception.py*
+%{_datadir}/%{vdsm_name}/storage/storage_mailbox.py*
+%{_datadir}/%{vdsm_name}/storage/taskManager.py*
+%{_datadir}/%{vdsm_name}/storage/task.py*
+%{_datadir}/%{vdsm_name}/storage/threadLocal.py*
+%{_datadir}/%{vdsm_name}/storage/threadPool.py*
+%{_datadir}/%{vdsm_name}/storage/volume.py*
 %{_libexecdir}/%{vdsm_name}/safelease
 %{_libexecdir}/%{vdsm_name}/spmprotect.sh
 %{_libexecdir}/%{vdsm_name}/spmstop.sh
@@ -667,9 +672,9 @@ exit 0
 %files bootstrap
 %defattr(-, root, root, -)
 %doc COPYING
-%{_datadir}/%{vdsm_bootstrap}/vds_bootstrap.py*
+%attr (755, root, root) %{_datadir}/%{vdsm_bootstrap}/vds_bootstrap.py*
 %{_datadir}/%{vdsm_bootstrap}/deployUtil.py*
-%{_datadir}/%{vdsm_bootstrap}/vds_bootstrap_complete.py*
+%attr (755, root, root) %{_datadir}/%{vdsm_bootstrap}/vds_bootstrap_complete.py*
 
 %files reg
 %defattr(-, root, root, -)
@@ -693,7 +698,7 @@ exit 0
 %{_datadir}/%{vdsm_reg}/config.py*
 %{_datadir}/%{vdsm_reg}/deployUtil.py*
 %{_datadir}/%{vdsm_reg}/createDaemon.py*
-%{python_sitelib}/ovirt_config_setup/rhevm.py*
+%{python_sitelib}/ovirt_config_setup/engine.py*
 %{_datadir}/%{vdsm_reg}/save-config
 %{_sysconfdir}/ovirt-config-boot.d/vdsm-config
 %{_sysconfdir}/ovirt-commandline.d/vdsm-reg
@@ -710,6 +715,9 @@ exit 0
 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/10_faqemu
 
 %changelog
+* Tue Jan 10 2012 Federico Simoncelli <fsimonce at redhat.com> - 4.9.2-0.git951b41d.fc16
+- vdsm-4.9.2-g951b41d
+
 * Fri Dec 02 2011 Federico Simoncelli <fsimonce at redhat.com> - 4.9.1-2.git931a43e.fc16
 - add the revision control comments to the specfile