[node-patches] Change in ovirt-node[master]: spec: Remove igor stuff if not needed

fabiand at fedoraproject.org fabiand at fedoraproject.org
Thu Apr 3 12:58:51 UTC 2014


Fabian Deutsch has uploaded a new change for review.

Change subject: spec: Remove igor stuff if not needed
......................................................................

spec: Remove igor stuff if not needed

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/96/26396/1

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index dc505af..5fbc40b 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -451,13 +451,14 @@
 
 # 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
+%{__rm} -vf %{buildroot}/%{_libexecdir}/ovirt-node-igor-slave \
+            %{buildroot}/%{_unitdir}/ovirt-node-igor-slave.service \
+            %{buildroot}/%{_initrddir}/ovirt-node-igor-slave
 %endif
 
 # Remove minimizer if unneeded
 %if ! 0%{?with_minimizer}
-rm -vf %{buildroot}/%{_sbindir}/image-minimizer
+%{__rm} -vf %{buildroot}/%{_sbindir}/image-minimizer
 %endif
 
 
@@ -519,13 +520,13 @@
 
 # Remove minimizer if not needed
 %if ! 0%{?with_minimizer}
-rm -v %{buildroot}/%{_sbindir}/image-minimizer
+rm -vf %{buildroot}/%{_sbindir}/image-minimizer
 %endif
 
 # Remove igor stuff if not needed
 %if ! 0%{?with_igor}
-rm -v %{buildroot}/etc/rc.d/init.d/ovirt-node-igor-slave \
-      %{buildroot}/usr/libexec/ovirt-node-igor-slave
+rm -vf %{buildroot}/etc/rc.d/init.d/ovirt-node-igor-slave \
+       %{buildroot}/usr/libexec/ovirt-node-igor-slave
 %endif
 
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib94e1b35f1e0ba4b413a472e41508501d0e9a655
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