[packages/zabbix] fix tmpfiles config install

jajcus jajcus at pld-linux.org
Sat Oct 1 18:54:14 CEST 2016


commit 6594aa3f3ef8b1688e9da58a77e48255d8ad2d98
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Sat Oct 1 17:30:35 2016 +0200

    fix tmpfiles config install

 zabbix.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/zabbix.spec b/zabbix.spec
index 08ff970..dad29b8 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -233,7 +233,7 @@ This package provides the Zabbix Java Gateway.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/webapps/%{_webapp},%{_appdir}} \
-	$RPM_BUILD_ROOT{/run/zabbix,/var/log/zabbix,%{systemdunitdir},%{tmpfilesdir}}
+	$RPM_BUILD_ROOT{/run/zabbix,/var/log/zabbix,%{systemdunitdir},%{systemdtmpfilesdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -249,7 +249,7 @@ install	%{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/zabbix_agentd.service
 install	%{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}/zabbix_proxy.service
 install	%{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/zabbix_java.service
 
-cp -p %{SOURCE6} $RPM_BUILD_ROOT%{tmpfilesdir}/zabbix.conf
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/zabbix.conf
 
 mv $RPM_BUILD_ROOT%{_appdir}/frontends/php/conf $RPM_BUILD_ROOT%{_sysconfdir}/frontend
 ln -s %{_sysconfdir}/frontend $RPM_BUILD_ROOT%{_appdir}/frontends/php/conf
@@ -373,6 +373,7 @@ fi
 %dir %{_appdir}/frontends
 %dir %attr(770,root,zabbix) /run/zabbix
 %dir %attr(775,root,zabbix) /var/log/zabbix
+%{systemdtmpfilesdir}/zabbix.conf
 
 %files agentd
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zabbix.git/commitdiff/3e3c35a0f71bf99ba697264c323121ab96503ae3



More information about the pld-cvs-commit mailing list