From 9a160b11f9af0afe1dc4df2016e46150eddfd912 Mon Sep 17 00:00:00 2001
From: Yaniv Bronhaim <ybronhei@redhat.com>
Date: Dec 11 2013 09:34:28 +0000
Subject: Format in ovirt-3.3.3 patches


---

diff --git a/vdsm.spec b/vdsm.spec
index 14ec16c..6163e00 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -46,7 +46,7 @@
 
 Name:           %{vdsm_name}
 Version:        4.13.2
-Release:        0%{?dist}%{?extra_release}
+Release:        1%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -60,6 +60,19 @@ Url:            http://www.ovirt.org/wiki/Vdsm
 #  ./autogen.sh --system
 #  make VERSION={version}-{vdsm_release} dist
 Source0:        %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
+# ovirt-3.3.3 patches
+Patch0:         0001-Reorder-limit-checks-in-grow-quest.patch
+Patch1:         0002-domainMonitor-Improve-logging.patch
+Patch2:         0003-Remove-verbosity-from-restorecon-hack-for-var-log-co.patch
+Patch3:         0004-deployUtil-expect-integer-vlan-id-from-new-netinfo.patch
+Patch4:         0005-gluster-correct-parameter-for-creating-hookpath-in-v.patch
+Patch5:         0006-vdsm.spec-Remove-Obsoletes-python-cpopen.patch
+Patch6:         0007-Allow-disable-MOM-KSM-control.patch
+Patch7:         0008-Allow-setting-just-a-single-value-in-MoM-policy.patch
+Patch8:         0009-vm-Fix-exception-when-shutdown-called-on-vm-in-Down-.patch
+Patch9:         0010-threadPool-Do-not-keep-reference-to-tasks.patch
+Patch10:        0011-domainMonitor-Separate-change-detection-from-lastChe.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python
@@ -326,7 +339,6 @@ Summary: Creates a sub-process in simpler safer manner.
 
 BuildRequires: python2-devel
 Provides: python-cpopen = 1.2.3
-Obsoletes: python-cpopen
 
 %description python-cpopen
 Python package for creating sub-process in simpler and safer manner by using C
@@ -559,6 +571,18 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
 
 %prep
 %setup -q
+# ovirt-3.3.3 patches
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %if 0%{?rhel} == 6
 sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
@@ -674,7 +698,7 @@ fi
 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
+/sbin/restorecon -R /var/log/core >/dev/null 2>&1
 # hack until we replace core dump with abrt
 
 %if 0%{?rhel}
@@ -1324,6 +1348,13 @@ exit 0
 %attr(755, root, root) %{python_sitearch}/cpopen/cpopen.so*
 
 %changelog
+* Wed Dec 11 2013 Yaniv Bronhaim <ybronhei@redhat.com> - 4.13.2-1
+- fix cpopen obsolete loop
+- fix threadPool refs
+- mom policy fixes
+- restorecon hack in spec file
+- domainMonitor fixed last check flow
+
 * Tue Dec 10 2013 Yaniv Bronhaim <ybronhei@redhat.com> - 4.13.2-0
 - Bumping minor version due to recent merge of ovirt-3.3 patches