[node-patches] Change in ovirt-node[master]: Build oVirt Node on F20

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Build oVirt Node on F20
......................................................................

Build oVirt Node on F20

Account for unversioned docfiles, /usr/bin/ changes, and prep
for more changes with new systemd RPM macros.

Change-Id: I8a60d4c42fa30c4a7bd009b2e4437d8213b6305e
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M ovirt-node.spec.in
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/33/22433/1

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index d364659..1d0226b 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -3,6 +3,7 @@
 %global mgmt_scripts_dir %{_sysconfdir}/node.d
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %define is_f16 %(test "0%{?fedora}" == "016" && echo 1 || echo 0)
+%define is_f20 %(test "0%{?fedora}" == "020" && echo 1 || echo 0)
 %define is_min_f19 %(test "0%{?fedora}" -ge "019" && echo 1 || echo 0)
 %define is_fedora_systemd %(test 0%{?fedora} -ne 0 && test %{?fedora} -ge 16 && echo 1 || echo 0)
 %define is_rhel_systemd %(test 0%{?rhel} -ne 0 && test %{?rhel} -ge 7 && echo 1 || echo 0)
@@ -66,7 +67,11 @@
 Requires:       ethtool
 Requires:       cracklib-python
 Requires:       dracut
+%if %{is_f20}
+Requires:       /usr/bin/hostname
+%else
 Requires:       /bin/hostname
+%fi
 Requires:       tuned
 %if %{is_min_f19}
 Requires:       NetworkManager
@@ -242,7 +247,11 @@
 # SELinux subpackage
 #
 %global selinux_variants targeted
+%if %{is_f20}
+%global selinux_policyver %_selinux_policy_version
+%else
 %global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
+%endif
 %global modulename ovirt
 
 %package selinux
@@ -254,7 +263,7 @@
 Requires:         selinux-policy >= %{selinux_policyver}
 %endif
 Requires:         %{name} = %{version}-%{release}
-Requires:         selinux-policy-base
+Requires:         selinux-policy-base, selinux-policy-doc
 Requires(post):   /usr/sbin/semodule, /sbin/restorecon
 Requires(postun): /usr/sbin/semodule, /sbin/restorecon
 


-- 
To view, visit http://gerrit.ovirt.org/22433
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a60d4c42fa30c4a7bd009b2e4437d8213b6305e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>