--- cauldron/zabbix/current/SPECS/zabbix.spec	2013/01/18 13:33:54	389408
+++ cauldron/zabbix/current/SPECS/zabbix.spec	2013/01/18 13:37:38	389409
@@ -3,7 +3,7 @@
 
 Name:		zabbix
 Version:	2.0.4
-Release:	%mkrel 2
+Release:	%mkrel 3
 Summary:	Open-source monitoring solution for your IT infrastructure
 Group:		Networking/Other
 License:	GPLv2+
@@ -13,6 +13,7 @@
 Source2:	zabbix-server.init
 Source3:	zabbix-agent.init
 Source4:	zabbix-logrotate.in
+Source5:	%{name}-tmpfiles.conf
 
 %define database %{nil}
 %define zdb %{nil}
@@ -137,7 +138,6 @@
 mkdir -p %{buildroot}%{_datadir}/%{name}/schema
 mkdir -p %{buildroot}%{_datadir}/%{name}/web
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
-mkdir -p %{buildroot}%{_localstatedir}/run/%{name}
 
 # php frontend
 cp -a frontends/php/* %{buildroot}%{_datadir}/%{name}/web
@@ -153,11 +153,11 @@
 # drop config files in place
 install -m 0644 conf/%{name}_agent.conf %{buildroot}%{_sysconfdir}/%{name}
 cat conf/%{name}_agentd.conf | sed \
-    -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/%{name}/%{name}_agentd.pid|g' \
+    -e 's|PidFile=.*|PidFile=/run/%{name}/%{name}_agentd.pid|g' \
     -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/%{name}/%{name}_agentd.log|g' \
     > %{buildroot}%{_sysconfdir}/%{name}/%{name}_agentd.conf
 cat conf/zabbix_server.conf | sed \
-    -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/%{name}/%{name}.pid|g' \
+    -e 's|PidFile=.*|PidFile=/run/%{name}/%{name}.pid|g' \
     -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/%{name}/%{name}_server.log|g' \
     -e 's|AlertScriptsPath=/home/%{name}/bin/|AlertScriptsPath=%{_localstatedir}/lib/%{name}/|g' \
     -e 's|DBUser=root|DBUser=%{name}|g' \
@@ -176,6 +176,10 @@
 install -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/%{name}
 install -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/init.d/%{name}-agent
 
+# tmpfiles
+install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{name}-agent.conf
+
 # database schemata
 cp -a database %{buildroot}/%{_datadir}/%{name}/schema
 cp -a upgrades %{buildroot}/%{_datadir}/%{name}/schema
@@ -192,9 +196,11 @@
 %_pre_useradd %{name} %{_localstatedir}/lib/%{name} /sbin/nologin
 
 %post
+%_tmpfilescreate %{name}
 %_post_service %{name}
 
 %post agent
+%_tmpfilescreate %{name}-agent
 %_post_service %{name}-agent
 
 %preun
@@ -212,10 +218,10 @@
 %{_sbindir}/%{name}_server
 %{_sysconfdir}/init.d/%{name}
 %{_mandir}/man8/%{name}_server.8*
+%{_tmpfilesdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}_server.conf
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
-%attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 
 %files agent
 %doc AUTHORS ChangeLog COPYING INSTALL NEWS README
@@ -228,11 +234,11 @@
 %{_mandir}/man1/%{name}_get.1*
 %{_mandir}/man8/%{name}_agentd.8*
 %{_sysconfdir}/init.d/%{name}-agent
+%{_tmpfilesdir}/%{name}-agent.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-agent
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}_agent.conf
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}_agentd.conf
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
-%attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 
 %files web
 %doc README