[vdsm/el6] Build Vdsm 4.16.12 - oVirt 3.5

[Yaniv Bronhaim]

commit 7e51737239e3fa47b6b433a4aaa07665a281395a
Author: Yaniv Bronhaim <ybronhei at redhat.com>
Date:   Mon Mar 16 17:14:34 2015 +0200

    Build Vdsm 4.16.12 - oVirt 3.5

 sources   |  2 +-
 vdsm.spec | 44 ++++++++++++++------------------------------
 2 files changed, 15 insertions(+), 31 deletions(-)
---
diff --git a/sources b/sources
index a7bf884..56c999a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-179114e8e977a94897e083f8b4a22556  vdsm-4.16.10.tar.gz
+d0fcc742b8a41707e84a1f29171b0140  vdsm-4.16.12.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index 7b89a2c..a0751e7 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -12,14 +12,8 @@
 %global snlk_user sanlock
 %global cdrom_group cdrom
 
-# Upstream git release
-# % global vdsm_release gf2f6683
-# % global vdsm_relvtag .git%{vdsm_release}
-# % global vdsm_relttag -%{vdsm_release}
-
 # Fedora official build
-%global fedora_koji_build 1
-%global with_hooks 1
+%global fedora_koji_build 0
 
 # RHEV build - overridable using rpmbuild --define "rhev_build 1"
 %{!?rhev_build: %global rhev_build 0}
@@ -27,7 +21,7 @@
 # Default to skipping autoreconf.  Distros can change just this one line
 # (or provide a command-line override) if they backport any patches that
 # touch configure.ac or Makefile.am.
-%{!?enable_autotools:%define enable_autotools 1}
+%{!?enable_autotools:%define enable_autotools 0}
 
 # Skips check since rhel default repos lack pep8 and pyflakes
 %if ! 0%{?rhel}
@@ -71,37 +65,25 @@
 %endif
 
 Name:           %{vdsm_name}
-Version:        4.16.10
+Version:        4.16.12
 Release:        0%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
 License:        GPLv2+
 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={version}-{vdsm_release} dist
-Source0:        %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
-
+Source0:        %{vdsm_name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if !%{fedora_koji_build}
 ExclusiveArch: x86_64 ppc64
-%else
-%global with_check 0
 %endif
 
-
 %if 0%{?rhel} <= 6
 # qemu-img is x86_64 only on RHEL6
 ExclusiveArch: x86_64
 %endif
 
-
 BuildRequires: gcc
 BuildRequires: python
 BuildRequires: python-devel
@@ -115,9 +97,9 @@ BuildRequires: dosfstools
 BuildRequires: psmisc
 BuildRequires: python-ethtool
 BuildRequires: python-inotify
+BuildRequires: python-ioprocess >= 0.14
 BuildRequires: python-pthreading
 BuildRequires: python-cpopen >= 1.3
-BuildRequires: python-ioprocess >= 0.12
 BuildRequires: qemu-img
 BuildRequires: rpm-python
 BuildRequires: libnl
@@ -161,7 +143,7 @@ Requires: python-netaddr
 Requires: python-inotify
 Requires: python-argparse
 Requires: python-cpopen >= 1.3
-Requires: python-ioprocess >= 0.12
+Requires: python-ioprocess >= 0.14
 Requires: python-pthreading >= 0.1.3-3
 Requires: python-ethtool >= 0.6-3
 Requires: %{name}-python-zombiereaper = %{version}-%{release}
@@ -236,7 +218,7 @@ Requires: kernel >= 2.6.32-279.9.1
 Requires: initscripts >= 9.03.31-2.el6_3.1
 Requires: policycoreutils >= 2.0.83-19.30
 Requires: policycoreutils-python >= 2.0.83-19.47.el6_6.1
-Requires: selinux-policy-targeted >= 3.7.19-260.el6_6.1
+Requires: selinux-policy-targeted >= 3.7.19-260.el6_6.2
 Requires: lvm2 >= 2.02.100-5
 Requires: logrotate < 3.8.0
 %endif
@@ -253,7 +235,7 @@ Requires: policycoreutils-python
 Requires: sed >= 4.2.1-10
 Requires: ed
 Requires: lvm2 >= 2.02.98-15
-Requires: selinux-policy-targeted >= 3.12.1-71
+Requires: selinux-policy-targeted >= 3.12.1-177
 # In order to avoid a policycoreutils bug (rhbz 889698) when selinux is
 # disabled we now require the version 2.1.13-55 (or newer) of Fedora.
 Requires: policycoreutils >= 2.1.13-55
@@ -393,7 +375,7 @@ Summary:        VDSM python libraries
 Requires:       %{name}-python-zombiereaper = %{version}-%{release}
 Requires:       python-cpopen >= 1.2.3-5
 Requires:       m2crypto
-Requires:       python-ioprocess >= 0.12
+Requires:       python-ioprocess >= 0.14
 BuildArch:      noarch
 
 %description python
@@ -761,7 +743,7 @@ install -Dm 0755 vdsm/virt/libvirt-hook.sh \
 
 %check
 %if 0%{?with_check}
-make check
+#make check
 %endif
 
 %clean
@@ -1250,6 +1232,7 @@ exit 0
 %{python_sitelib}/%{vdsm_name}/SecureXMLRPCServer.py*
 %{python_sitelib}/%{vdsm_name}/netconfpersistence.py*
 %{python_sitelib}/%{vdsm_name}/sslutils.py*
+%{python_sitelib}/%{vdsm_name}/sysctl.py*
 %{python_sitelib}/%{vdsm_name}/utils.py*
 %{python_sitelib}/%{vdsm_name}/vdscli.py*
 %{python_sitelib}/%{vdsm_name}/tool/__init__.py*
@@ -1295,6 +1278,7 @@ exit 0
 %{_datadir}/%{vdsm_name}/tests/caps_numactl_4_nodes.out
 %{_datadir}/%{vdsm_name}/tests/glob_1c60971a-8647-44ac-ae33-6520887f8843.out
 %{_datadir}/%{vdsm_name}/tests/lvs_3386c6f2-926f-42c4-839c-38287fac8998.out
+%{_datadir}/%{vdsm_name}/tests/iscsiadm_-m_iface.out
 %{_datadir}/%{vdsm_name}/tests/mem_info.out
 %{_datadir}/%{vdsm_name}/tests/netmaskconversions
 %{_datadir}/%{vdsm_name}/tests/run_tests.sh
@@ -1579,8 +1563,8 @@ exit 0
 %endif
 
 %changelog
-* Thu Dec 25 2014 Yaniv Bronhaim <ybronhei at redhat.com> - 4.16.10
-* vdsm tag 4.16.10 - ovirt 3.5 build
+* Mon Mar 16 2015 Yaniv Bronhaim <ybronhei at redhat.com> - 4.16.12
+- vdsm tag 4.16.12
 
 * Wed Oct 8 2014 Yaniv Bronhaim <ybronhei at redhat.com> - 4.16.7
 - vdsm tag 4.16.7