[node-patches] Change in ovirt-node[master]: Only ship augeas.py on el6

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: Only ship augeas.py on el6
......................................................................

Only ship augeas.py on el6

Change-Id: I290c6aa5f2804df99384c5bd44bbe9e0e4ac2e38
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=797797
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M ovirt-node.spec.in
1 file changed, 13 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/49/27249/1

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 5fbc40b..91ed7d6 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -42,12 +42,14 @@
 Requires:       systemd-units
 Requires(post):     systemd-units
 Requires(preun):    systemd-units
-#Requires:       python-augeas
+%endif
+%if ! 0%{?is_el6}
+Requires:       python-augeas
+%endif
 Requires:       glusterfs-client >= 2.0.1
 Requires:       python-IPy
 Requires:       grub2
 Requires:       system-release
-%endif
 Requires:       libvirt >= 0.9.2, libvirt-python
 Requires:       augeas >= 0.3.5
 Requires:       bridge-utils
@@ -433,8 +435,10 @@
 %endif
 
 # python-augeas is not in RHEL-6
+%if 0%{?is_el6}
 # specific version of python-augeas is not available in Fedora yet
 %{__install} -p -m0644 scripts/augeas.py %{buildroot}%{python_sitelib}
+%endif
 
 # Install SELinux policy module
 cd semodule
@@ -459,6 +463,11 @@
 # Remove minimizer if unneeded
 %if ! 0%{?with_minimizer}
 %{__rm} -vf %{buildroot}/%{_sbindir}/image-minimizer
+%endif
+
+# Remove augeas.py if not needed
+%if ! 0%{?is_el6}
+%{__rm} -vf %{buildroot}/%{python_sitelib}/augeas*
 %endif
 
 
@@ -699,7 +708,9 @@
 %exclude %{python_sitelib}/ovirt_config_setup/cim.py*
 %exclude %{python_sitelib}/ovirt_config_setup/snmp.py*
 %{python_sitelib}/ovirtnode
+%if 0%{?is_el6}
 %{python_sitelib}/augeas*
+%endif
 %{_sysconfdir}/ovirt-early.d
 %dir %{_sysconfdir}/ovirt-commandline.d
 %if %{is_systemd}


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I290c6aa5f2804df99384c5bd44bbe9e0e4ac2e38
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>