From bf94dbfa127236e44fee90c4e81a56603a1f9073 Mon Sep 17 00:00:00 2001
From: Yaniv Bronhaim <ybronhei@redhat.com>
Date: Aug 16 2016 23:01:10 +0000
Subject: vdsm build fedora master branch - 4.18 ovirt4.0


---

diff --git a/sources b/sources
index 803ac6f..a0cd42c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86eef41dad36acd6c2524591c2464361  vdsm-4.18.999.tar.gz
+ef2b487086bc44605ba6fb1c09e504d7  vdsm-4.18.999.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index 72a5253..8ddc392 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -42,7 +42,6 @@
 %global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d
 %endif
 
-%global _udevrulesdir %{_libdir}/udev/rules.d/
 %global _udevexecdir %{_libdir}/udev/
 
 # Disable debuginfo package, since vdsm is a meta-package
@@ -50,7 +49,7 @@
 
 Name:           %{vdsm_name}
 Version:        4.18.999
-Release:        396.gitfb69df9%{?dist}%{?extra_release}
+Release:        417.git896954a%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -89,6 +88,7 @@ BuildRequires: python-pthreading
 BuildRequires: qemu-img
 BuildRequires: rpm-python
 BuildRequires: python-blivet
+BuildRequires: sanlock-python
 
 %if 0%{?with_openvswitch}
 BuildRequires: openvswitch >= 2.0.0
@@ -347,19 +347,6 @@ Requires:       python-ioprocess >= 0.16.1-1
 %description python
 Shared libraries between the various VDSM packages.
 
-%post python
-# REQUIRED_FOR: Upgrade from 4.14 to 4.17
-# HACK: Remove vdsm python lib __init__ file if installed on old location
-# https://bugzilla.redhat.com/show_bug.cgi?id=1279167
-if [ "$1" -ge 2 ]; then
-    if [ -d "%{python2_sitearch}/%{vdsm_name}" ]; then
-        logger -t '%{vdsm_name}' \
-            'Disabling old vdsm package in %{python2_sitearch}/%{vdsm_name}.' \
-            'Removing %{python2_sitearch}/%{vdsm_name}/init.py*'
-        rm -f %{python2_sitearch}/%{vdsm_name}/__init__.py*
-    fi
-fi
-
 %package tests
 Summary:        VDSM Test Suite
 BuildArch:      noarch
@@ -758,7 +745,7 @@ sed -i -e 's/@SSL_IMPLEMENTATION@/m2c/g' lib/vdsm/config.py
 sed -i -e 's\@VDSMRPCPYLIBDIR@\%{python_sitelib}/%{vdsm_name}/rpc\g' lib/vdsm/constants.py
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install
 
 # Creating VDSM logs in this session to avoid rpmbuild
 # complain during the build
@@ -954,6 +941,7 @@ exit 0
 %{_datadir}/%{vdsm_name}/virt/recovery.py*
 %{_datadir}/%{vdsm_name}/virt/vmtune.py*
 %{_datadir}/%{vdsm_name}/virt/vm.py*
+%{_datadir}/%{vdsm_name}/virt/vm_migrate_hook.py*
 %{_datadir}/%{vdsm_name}/virt/vmxml.py*
 %{_datadir}/%{vdsm_name}/virt/vmdevices/__init__.py*
 %{_datadir}/%{vdsm_name}/virt/vmdevices/common.py*
@@ -986,6 +974,7 @@ exit 0
 %{_libexecdir}/%{vdsm_name}/ovirt_functions.sh
 %{_libexecdir}/%{vdsm_name}/vdsm-gencerts.sh
 %{_libexecdir}/%{vdsm_name}/vdsmd_init_common.sh
+%{_libexecdir}/%{vdsm_name}/vm_migrate_hook.py*
 %{_libexecdir}/%{vdsm_name}/kvm2ovirt
 %{_libexecdir}/%{vdsm_name}/wait_for_ipv4s
 %{_datadir}/%{vdsm_name}/supervdsm_api/__init__.py*
@@ -1411,8 +1400,6 @@ exit 0
 
 %files hook-ovs
 %{_sysconfdir}/sudoers.d/50_vdsm_hook_ovs
-%{_libexecdir}/%{vdsm_name}/ovs_migrate.py*
-%{_libexecdir}/%{vdsm_name}/ovs_utils.py*
 %{_libexecdir}/%{vdsm_name}/hooks/after_get_caps/50_ovs
 %{_libexecdir}/%{vdsm_name}/hooks/after_get_caps/ovs_utils.py*
 %{_libexecdir}/%{vdsm_name}/hooks/after_get_stats/50_ovs