[vdsm/f16] update to vdsm-4.9.3.1

[Federico Simoncelli]

commit 813dd4b055cb1ffc22bfc742a2b353f5eaa4ce0c
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Mon Jan 16 12:07:16 2012 -0500

    update to vdsm-4.9.3.1

 .gitignore |    1 +
 sources    |    2 +-
 vdsm.spec  |   41 +++++++++++++++++++++++------------------
 3 files changed, 25 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8f5389..48bba80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /vdsm-4.9.1-931a43e.tar.gz
 /vdsm-4.9.2-951b41d.tar.gz
 /vdsm-4.9.2-1d7b929.tar.gz
+/vdsm-4.9.3.1.tar.gz
diff --git a/sources b/sources
index 67721da..78e50f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0015262c0d8b08efed75fcc1ad3cf889  vdsm-4.9.2-1d7b929.tar.gz
+20501d2573da80b55a73a87669a19b66  vdsm-4.9.3.1.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index 7b3d485..fda0b8e 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -4,7 +4,9 @@
 %global vdsm_reg vdsm-reg
 
 # Upstream release
-%global vdsm_release 1d7b929
+#% global vdsm_release 1d7b929
+#% global vdsm_relvtag .git%{vdsm_release}
+#% global vdsm_relttag -%{vdsm_release}
 
 # Required users and groups
 %global vdsm_user vdsm
@@ -15,8 +17,8 @@
 %global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d
 
 Name:           %{vdsm_name}
-Version:        4.9.2
-Release:        1.git%{vdsm_release}%{?dist}%{?extra_release}
+Version:        4.9.3.1
+Release:        0%{?vdsm_relvtag}%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -29,7 +31,7 @@ Url:            http://www.ovirt.org/wiki/Vdsm
 #  git reset --hard {vdsm_release}
 #  ./autogen.sh --system
 #  make VERSION={version}-{vdsm_release} dist
-Source0:        %{vdsm_name}-%{version}-%{vdsm_release}.tar.gz
+Source0:        %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python
@@ -255,7 +257,7 @@ VDSM registration package. Used to register a Linux host to a Virtualization
 Manager.
 
 %prep
-%setup -q -n %{vdsm_name}-%{version}-%{vdsm_release}
+%setup -q -n %{vdsm_name}-%{version}%{?vdsm_relttag}
 
 %build
 %configure %{?with_hooks:--enable-hooks}
@@ -435,27 +437,27 @@ exit 0
 %dir %{_libexecdir}/%{vdsm_name}
 %dir %{_datadir}/%{vdsm_name}
 %dir %{_datadir}/%{vdsm_name}/storage
-%{_datadir}/%{vdsm_name}/define.py*
-%{_datadir}/%{vdsm_name}/clientIF.py*
 %{_datadir}/%{vdsm_name}/caps.py*
-%{_datadir}/%{vdsm_name}/utils.py*
+%{_datadir}/%{vdsm_name}/clientIF.py*
 %{_datadir}/%{vdsm_name}/constants.py*
-%{_datadir}/%{vdsm_name}/vm.py*
-%{_datadir}/%{vdsm_name}/vdscli.py*
-%{_datadir}/%{vdsm_name}/supervdsm.py*
-%{_datadir}/%{vdsm_name}/supervdsmServer.py*
-%{_datadir}/%{vdsm_name}/libvirtvm.py*
-%{_datadir}/%{vdsm_name}/libvirtconnection.py*
-%{_datadir}/%{vdsm_name}/hooks.py*
+%{_datadir}/%{vdsm_name}/define.py*
+%{_datadir}/%{vdsm_name}/get-vm-pid
 %{_datadir}/%{vdsm_name}/hooking.py*
+%{_datadir}/%{vdsm_name}/hooks.py*
+%{_datadir}/%{vdsm_name}/libvirtconnection.py*
 %{_datadir}/%{vdsm_name}/libvirtev.py*
+%{_datadir}/%{vdsm_name}/libvirtvm.py*
+%{_datadir}/%{vdsm_name}/mk_sysprep_floppy
+%{_datadir}/%{vdsm_name}/prepare-vmchannel
+%{_datadir}/%{vdsm_name}/supervdsm.py*
+%{_datadir}/%{vdsm_name}/supervdsmServer.py*
+%{_datadir}/%{vdsm_name}/utils.py*
+%{_datadir}/%{vdsm_name}/vdscli.py*
 %{_datadir}/%{vdsm_name}/vdsm
 %{_datadir}/%{vdsm_name}/vdsm-restore-net-config
 %{_datadir}/%{vdsm_name}/vdsm-store-net-config
+%{_datadir}/%{vdsm_name}/vm.py*
 %{_datadir}/%{vdsm_name}/write-net-config
-%{_datadir}/%{vdsm_name}/mk_sysprep_floppy
-%{_datadir}/%{vdsm_name}/get-vm-pid
-%{_datadir}/%{vdsm_name}/prepare-vmchannel
 %config(noreplace) %{_sysconfdir}/%{vdsm_name}/logger.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/vdsm
 %config(noreplace) %{_sysconfdir}/rwtab.d/vdsm
@@ -715,6 +717,9 @@ exit 0
 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/10_faqemu
 
 %changelog
+* Mon Jan 16 2012 Federico Simoncelli <fsimonce at redhat.com> - 4.9.3.1-0.fc16
+- vdsm-4.9.3.1
+
 * Fri Jan 13 2012 Dan Kenigsberg <danken at redhat.com> - 4.9.2-1.git1d7b929.fc16
 - vdsm-4.9.2-g1d7b929