[node-patches] Change in ovirt-node[master]: spec: Only build igor plugin on Fedora
fabiand at fedoraproject.org
fabiand at fedoraproject.org
Thu Mar 27 09:45:59 UTC 2014
Fabian Deutsch has uploaded a new change for review.
Change subject: spec: Only build igor plugin on Fedora
......................................................................
spec: Only build igor plugin on Fedora
Change-Id: I555a59a0537ce2e2687108f8f9a15d1b58007f76
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M ovirt-node.spec.in
1 file changed, 24 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/43/26143/1
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 970eef3..e5e12a4 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -12,6 +12,9 @@
%define dracutdir %(test -e /usr/share/dracut && echo "/usr/share/dracut/modules.d" || echo "/usr/lib/dracut/modules.d")
%define is_el6 %(test 0%{?centos} -eq 06 || test 0%{?rhel} -eq 06 && echo 1 || echo 0)
+# Igor can only be shipped on Fedora (because of python-uinput)
+%define with_igor %{is_min_f19}
+
Summary: The %{product_family} daemons/scripts
Name: ovirt-node
@@ -308,6 +311,7 @@
#
# Igor service subpackage
#
+%if %{with_igor}
%package plugin-igor-slave
Summary: Igor slave plugin for %{product_family}
Group: Applications/System
@@ -339,6 +343,24 @@
fi
%else
/sbin/chkconfig --add ovirt-node-igor-slave >/dev/null 2>&1 || :
+%endif
+
+
+%preun plugin-igor-slave
+%if ! %{is_systemd}
+if [ $1 = 0 ] ; then
+ /sbin/service ovirt-node-igor-slave stop >/dev/null 2>&1
+ /sbin/chkconfig --del ovirt-node-igor-slave
+fi
+%else
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable ovirt-node-igor-slave.service > /dev/null 2>&1 || :
+ /bin/systemctl stop ovirt-node-igor-slave.service > /dev/null
+fi
+%endif
+
+# </Igor service subpackage>
%endif
@@ -507,21 +529,6 @@
%endif
-%preun plugin-igor-slave
-%if ! %{is_systemd}
-if [ $1 = 0 ] ; then
- /sbin/service ovirt-node-igor-slave stop >/dev/null 2>&1
- /sbin/chkconfig --del ovirt-node-igor-slave
-fi
-%else
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable ovirt-node-igor-slave.service > /dev/null 2>&1 || :
- /bin/systemctl stop ovirt-node-igor-slave.service > /dev/null
-fi
-%endif
-
-
#
# FILES
#
@@ -573,7 +580,7 @@
%{_initrddir}/ovirt-cim
%endif
-
+%if %{with_igor}
%files plugin-igor-slave
%{_libexecdir}/ovirt-node-igor-slave
%if %{is_systemd}
@@ -581,6 +588,7 @@
%else
%{_initrddir}/ovirt-node-igor-slave
%endif
+%endif
%files selinux
--
To view, visit http://gerrit.ovirt.org/26143
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I555a59a0537ce2e2687108f8f9a15d1b58007f76
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>
More information about the node-patches
mailing list