Change in vdsm[master]: spec: janitorial: drop with_systemd_macros and with_tmpfiles

danken at redhat.com danken at redhat.com
Thu Sep 25 18:07:10 UTC 2014


Dan Kenigsberg has uploaded a new change for review.

Change subject: spec: janitorial: drop with_systemd_macros and with_tmpfiles
......................................................................

spec: janitorial: drop with_systemd_macros and with_tmpfiles

Nowadays we can assume that /usr/lib/tmpfiles.d and systemd_macros exist
whenever systemd does.

Change-Id: I9b27480cf2a40575f500e68ae4aebf36d7363e90
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M vdsm.spec.in
1 file changed, 5 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/33380/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index 48cc1f7..7351835 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -40,8 +40,6 @@
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %global with_systemd 1
-%global with_systemd_macros 1
-%global with_tmpfiles_macro 1
 %endif
 
 %if 0%{?rhel} == 6
@@ -695,7 +693,7 @@
 install -Dm 0755 vdsm_reg/vdsm-reg.init %{buildroot}%{_initrddir}/vdsm-reg
 %endif
 
-%if 0%{?with_tmpfiles_macro}
+%if 0%{?with_systemd}
 install -Dm 0644 init/systemd/vdsm-tmpfiles.d.conf \
                  %{buildroot}%{_tmpfilesdir}/%{vdsm_name}.conf
 %endif
@@ -819,7 +817,7 @@
     fi
 fi
 %else
-%if 0%{?with_systemd_macros}
+%if 0%{?with_systemd}
 %systemd_preun vdsmd.service
 %systemd_preun supervdsmd.service
 %else
@@ -894,7 +892,7 @@
     /sbin/chkconfig --add vdsm-reg
 fi
 %else
-%if 0%{?with_systemd_macros}
+%if 0%{?with_systemd}
 %systemd_post vdsm-reg.service
 %else
 if [ "$1" -eq 1 ] ; then
@@ -913,7 +911,7 @@
     /sbin/chkconfig --del vdsm-reg
 fi
 %else
-%if 0%{?with_systemd_macros}
+%if 0%{?with_systemd}
 %systemd_preun vdsm-reg.service
 %else
 if [ "$1" -eq 0 ]; then
@@ -999,7 +997,7 @@
 %if 0%{?with_systemd}
 %config(noreplace) %{_sysconfdir}/modules-load.d/vdsm.conf
 %endif
-%if 0%{?with_tmpfiles_macro}
+%if 0%{?with_systemd}
 %config(noreplace) %{_tmpfilesdir}/%{vdsm_name}.conf
 %endif
 %{_sysconfdir}/dhcp/dhclient.d/sourceRoute.sh


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b27480cf2a40575f500e68ae4aebf36d7363e90
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list