Change in vdsm[master]: vdsm.spec: adding {?with_tmpfiles_macro}

dougsland at redhat.com dougsland at redhat.com
Tue Jul 16 22:45:01 UTC 2013


Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: vdsm.spec: adding {?with_tmpfiles_macro}
......................................................................

vdsm.spec: adding {?with_tmpfiles_macro}

The macro %{_tmpfilesdir} was introduced by Fedora 18.
This patch will add a Fedora validation before using it.

Change-Id: I9fb3164fd8c9db7a19379de9975bb05eb60be1db
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M vdsm.spec.in
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/16976/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index 9741640..55acaac 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -35,6 +35,7 @@
 
 %if 0%{?fedora} >= 18
 %global with_systemd_macros 1
+%global with_tmpfiles_macro 1
 %endif
 
 Name:           %{vdsm_name}
@@ -569,8 +570,6 @@
                  %{buildroot}%{_unitdir}/vdsm-reg.service
 install -Dm 0644 vdsm/vdsm-modules-load.d.conf \
                  %{buildroot}%{_sysconfdir}/modules-load.d/vdsm.conf
-install -Dm 0644 vdsm/vdsm-tmpfiles.d.conf \
-                 %{buildroot}%{_tmpfilesdir}/%{vdsm_name}.conf
 %else
 # Install the SysV init scripts
 install -Dm 0755 vdsm/vdsmd.init %{buildroot}%{_initrddir}/vdsmd
@@ -579,6 +578,11 @@
 install -Dm 0755 vdsm_reg/vdsm-reg.init %{buildroot}%{_initrddir}/vdsm-reg
 install -Dm 0755 vdsm/vdsm-restore-net-config.init \
     %{buildroot}%{_initrddir}/vdsm-restore-net-config
+%endif
+
+%if 0%{?with_tmpfiles_macro}
+install -Dm 0644 vdsm/vdsm-tmpfiles.d.conf \
+                 %{buildroot}%{_tmpfilesdir}/%{vdsm_name}.conf
 %endif
 
 %if 0%{?rhel}
@@ -837,6 +841,8 @@
 %config(noreplace) %{_sysconfdir}/sysctl.d/vdsm
 %if 0%{?with_systemd}
 %config(noreplace) %{_sysconfdir}/modules-load.d/vdsm.conf
+%endif
+%if 0%{?with_tmpfiles_macro}
 %config(noreplace) %{_tmpfilesdir}/%{vdsm_name}.conf
 %endif
 %{_sysconfdir}/dhcp/dhclient.d/sourceRoute.sh


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fb3164fd8c9db7a19379de9975bb05eb60be1db
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>


More information about the vdsm-patches mailing list