[vdsm/f19] Updating to ovirt-3.3.2 - Vdsm 4.13.2-0

[Yaniv Bronhaim]

commit 38d395d59c4482d27f706e967c879683eb0c8fb0
Author: Yaniv Bronhaim <ybronhei at redhat.com>
Date:   Wed Dec 11 09:46:05 2013 +0200

    Updating to ovirt-3.3.2 - Vdsm 4.13.2-0

 sources   |    2 +-
 vdsm.spec |   52 +++++++++++++++++++++++++++-------------------------
 2 files changed, 28 insertions(+), 26 deletions(-)
---
diff --git a/sources b/sources
index 5427207..933ba21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-84a09ba25f1eaef08ddaf698aff40bfe  vdsm-4.13.0.tar.gz
+d5bc212655d9ba5255f2b3d2d0fe5c83  vdsm-4.13.2.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index e714801..14ec16c 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -45,8 +45,8 @@
 %endif
 
 Name:           %{vdsm_name}
-Version:        4.13.0
-Release:        11%{?dist}%{?extra_release}
+Version:        4.13.2
+Release:        0%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -60,7 +60,6 @@ Url:            http://www.ovirt.org/wiki/Vdsm
 #  ./autogen.sh --system
 #  make VERSION={version}-{vdsm_release} dist
 Source0:        %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python
@@ -170,7 +169,7 @@ Requires: initscripts >= 9.03.31-2.el6_3.1
 Requires: policycoreutils >= 2.0.83-19.30
 Requires: policycoreutils-python >= 2.0.83-19.30
 Requires: python-pthreading
-Requires: selinux-policy-targeted >= 3.7.19-155
+Requires: selinux-policy-targeted >= 3.7.19-195.el6_4.13
 Requires: lvm2 >= 2.02.95-10.el6_3.2
 Requires: logrotate < 3.8.0
 %endif
@@ -234,7 +233,13 @@ Requires: %{name}-python = %{version}-%{release}
 Requires: pyparted
 
 Requires(post): /usr/sbin/saslpasswd2
+
+%if 0%{?fedora} && 0%{?fedora} >= 21
+Requires(post): hostname
+%else
 Requires(post): /bin/hostname
+%endif
+
 Requires(post): policycoreutils-python
 Requires(preun): policycoreutils-python
 
@@ -554,6 +559,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
@@ -657,7 +663,7 @@ export LC_ALL=C
 # set the vdsm "secret" password for libvirt
 %{_bindir}/vdsm-tool set-saslpasswd
 
-# Have moved vdsm section in /etc/sysctl.conf to /etc/sysctl.d/vdsm.
+# Have moved vdsm section in /etc/sysctl.conf to /etc/sysctl.d/vdsm.conf.
 # So Remove them if it is played with /etc/sysctl.conf.
 if grep -q "# VDSM section begin" /etc/sysctl.conf; then
     /bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \
@@ -665,19 +671,17 @@ if grep -q "# VDSM section begin" /etc/sysctl.conf; then
 fi
 
 # hack until we replace core dump with abrt
-/usr/sbin/semanage fcontext -a -t virt_cache_t '/var/log/core(/.*)?'
+if /usr/sbin/selinuxenabled; then
+    /usr/sbin/semanage fcontext -a -t virt_cache_t '/var/log/core(/.*)?'
+fi
 /sbin/restorecon -R -v /var/log/core
+# hack until we replace core dump with abrt
 
 %if 0%{?rhel}
 if [ "$1" -eq 1 ] ; then
     /sbin/chkconfig --add vdsmd
     /sbin/chkconfig --add supervdsmd
     /sbin/chkconfig --add vdsm-restore-net-config
-
-    # drop this ugly hack when selinux-policy-3.7.19-195.el6.13 is released
-    /usr/sbin/semanage fcontext -a -s system_u -t virt_var_run_t -r s0 \
-        '/var/run/vdsm(/.*)?'
-    /sbin/restorecon /var/run/vdsm
 fi
 %else
 %if 0%{?with_systemd}
@@ -764,11 +768,9 @@ if [ "$1" -ge 1 ]; then
         %{_bindir}/vdsm-tool service-stop supervdsmd >/dev/null 2>&1
         supervdsmd_start_required='yes'
     fi
-    if %{_bindir}/vdsm-tool libvirt-configure | grep -q 'is done.'; then
-        if %{_bindir}/vdsm-tool service-status libvirtd >/dev/null 2>&1; then
-            %{_bindir}/vdsm-tool service-restart libvirtd >/dev/null 2>&1
-        fi
-    fi
+
+    %{_bindir}/vdsm-tool libvirt-configure >/dev/null 2>&1
+
     if [ "${supervdsmd_start_required}" = 'yes' ]; then
         %{_bindir}/vdsm-tool service-start supervdsmd >/dev/null 2>&1
     fi
@@ -880,7 +882,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.d/*.policy
 %config(noreplace) %{_sysconfdir}/logrotate.d/vdsm
 %config(noreplace) %{_sysconfdir}/rwtab.d/vdsm
-%config(noreplace) %{_sysconfdir}/sysctl.d/vdsm
+%config(noreplace) %{_sysconfdir}/sysctl.d/vdsm.conf
 %if 0%{?with_systemd}
 %config(noreplace) %{_sysconfdir}/modules-load.d/vdsm.conf
 %endif
@@ -911,12 +913,8 @@ exit 0
 %{_datadir}/%{vdsm_name}/storage/fileUtils.py*
 %{_datadir}/%{vdsm_name}/storage/fileVolume.py*
 %{_datadir}/%{vdsm_name}/storage/fuser.py*
-%if 0%{?with_gluster}
 %{_datadir}/%{vdsm_name}/storage/glusterSD.py*
 %{_datadir}/%{vdsm_name}/storage/glusterVolume.py*
-%else
-%exclude %{_datadir}/%{vdsm_name}/storage/gluster*
-%endif
 %{_datadir}/%{vdsm_name}/storage/hba.py*
 %{_datadir}/%{vdsm_name}/storage/hsm.py*
 %{_datadir}/%{vdsm_name}/storage/image.py*
@@ -1102,14 +1100,10 @@ exit 0
 %{_datadir}/%{vdsm_name}/tests/netmaskconversions
 %{_datadir}/%{vdsm_name}/tests/run_tests.sh
 %{_datadir}/%{vdsm_name}/tests/tc_filter_show.out
-%if 0%{?with_gluster}
 %{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfo.xml
 %{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfoNfs.xml
 %{_datadir}/%{vdsm_name}/tests/glusterVolumeRebalanceStatus.xml
 %{_datadir}/%{vdsm_name}/tests/glusterVolumeRemoveBricksStatus.xml
-%else
-%exclude %{_datadir}/%{vdsm_name}/tests/gluster*
-%endif
 %{_datadir}/%{vdsm_name}/tests/functional/*.py*
 %{_datadir}/%{vdsm_name}/tests/functional/*.policy
 
@@ -1330,6 +1324,14 @@ exit 0
 %attr(755, root, root) %{python_sitearch}/cpopen/cpopen.so*
 
 %changelog
+* Tue Dec 10 2013 Yaniv Bronhaim <ybronhei at redhat.com> - 4.13.2-0
+- Bumping minor version due to recent merge of ovirt-3.3 patches
+
+* Thu Nov 28 2013 Yaniv Bronhaim <ybronhei at redhat.com> - 4.13.0-14
+- Adding update patches from branch ovirt-3.3
+- Declaring ovirt-3.3.2 patchsets scope in spec which declares all the merged
+new patches
+
 * Tue Nov 12 2013 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.13.0-11
 - update from branch ovirt-3.3 which include:
   upgrade-fix-v3ResetMetaVolSize-argument