[node-patches] Change in ovirt-node[master]: spec: Build RHN/Satellite plugin only on RHEL

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: spec: Build RHN/Satellite plugin only on RHEL
......................................................................

spec: Build RHN/Satellite plugin only on RHEL

In future this plugin might also be completely suitable for the usage
with Satellite.

Change-Id: I942cccdc71ad18d1bb1bc4d7cfcf90a15a6b351f
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M ovirt-node.spec.in
1 file changed, 19 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/58/27758/1

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 1723c31..e5e47ef 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -18,6 +18,9 @@
 # The minimizer is only bundled on el6, because it is available on Fedora
 %define with_minimizer 0%{?is_el6}
 
+# RHN Plugin is only build on RHEL
+%define with_rhn 0%{?rhel}
+
 
 Summary:        The %{product_family} daemons/scripts
 Name:           ovirt-node
@@ -251,6 +254,8 @@
 #cleanup tmp directory from cim setup
 rm -rf /tmp/cim_schema*
 
+
+%if 0%{?with_rhn}
 %package plugin-rhn
 Summary:        RHN plugin for %{product_family} image
 Group:          Applications/System
@@ -261,6 +266,8 @@
 
 %description plugin-rhn
 This package provides the necessary rhn plugin tools for use with%{product_family} image.
+%endif
+
 
 #
 # SELinux subpackage
@@ -471,6 +478,15 @@
 %{__rm} -vf %{buildroot}/%{_sbindir}/image-minimizer
 %endif
 
+# Remove rhn stuff if not needed
+%if ! 0%{?with_rhn}
+%{__rm} -vf %{buildroot}/%{python_sitelib}/ovirt/node/setup/rhn/* \
+            %{buildroot}/%{_sysconfdir}/ovirt-commandline.d/rhn_autoinstall_args \
+            %{buildroot}/%{_sysconfdir}/ovirt-config-boot.d/rhn_autoinstall.py*
+rmdir -f %{buildroot}/%{python_sitelib}/ovirt/node/setup/rhn/
+%endif
+
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -527,18 +543,6 @@
 # remove symlink to keep original redhat-release
 rm -f /etc/system-release
 echo "%{product_family} release %{product_release}" > /etc/system-release
-
-# Remove minimizer if not needed
-%if ! 0%{?with_minimizer}
-rm -vf %{buildroot}/%{_sbindir}/image-minimizer
-%endif
-
-# Remove igor stuff if not needed
-%if ! 0%{?with_igor}
-rm -vf %{buildroot}/etc/rc.d/init.d/ovirt-node-igor-slave \
-       %{buildroot}/usr/libexec/ovirt-node-igor-slave
-%endif
-
 
 
 %preun
@@ -646,12 +650,15 @@
 %endif
 %endif
 
+
+%if 0%{?with_rhn}
 %files plugin-rhn
 %{python_sitelib}/ovirt/node/setup/rhn/__init__.py*
 %{python_sitelib}/ovirt/node/setup/rhn/rhn_model.py*
 %{python_sitelib}/ovirt/node/setup/rhn/rhn_page.py*
 %{_sysconfdir}/ovirt-commandline.d/rhn_autoinstall_args
 %{_sysconfdir}/ovirt-config-boot.d/rhn_autoinstall.py*
+%endif
 
 
 %files selinux


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

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