--- cauldron/tor/current/SPECS/tor.spec	2012/07/25 11:54:42	274220
+++ cauldron/tor/current/SPECS/tor.spec	2012/07/25 12:23:32	274221
@@ -2,7 +2,7 @@
 
 Name:		tor
 Version:	0.2.2.37
-Release:	%mkrel 1
+Release:	%mkrel 2
 Summary:	Anonymizing overlay network for TCP (The onion router)
 URL:		http://www.torproject.org/
 Group:		Networking/Other
@@ -24,7 +24,8 @@
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
 Source3: 	%{name}.sysconfig
-Source4:	tor.systemd.service
+Source4:	%{name}.service
+Source5:	%{name}-tmpfiles.conf
 
 %description
 Tor is a connection-based low-latency anonymous communication system.
@@ -73,7 +74,6 @@
 cat %{SOURCE3} > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 
 mkdir -p -m 700 ${RPM_BUILD_ROOT}%{_localstatedir}/lib/%{name}
-mkdir -p -m 755 ${RPM_BUILD_ROOT}%{_var}/run/%{name}
 mkdir -p -m 755 ${RPM_BUILD_ROOT}%{_var}/%{name}
 mkdir -p -m 755 ${RPM_BUILD_ROOT}%{_logdir}/%{name}
 
@@ -83,11 +83,13 @@
 
 # Systemd support
 install -D -p -m 0644 %SOURCE4 $RPM_BUILD_ROOT%_unitdir/%name.service
+install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
 
 %pre
 %_pre_useradd %{runuser} / /bin/false
 
 %post
+systemd-tmpfiles --create %{name}.conf
 %_post_service %{name}
 
 %preun
@@ -111,12 +113,12 @@
 %{_bindir}/tor-gencert
 %config(noreplace) %attr(0755,%{runuser},%{runuser}) %{_initrddir}/%{name}
 %_unitdir/%name.service
+%{_prefix}/lib/tmpfiles.d/%{name}.conf
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}
 %dir %attr(0755,root,%{runuser}) %{_sysconfdir}/%{name}/
 %config(noreplace) %attr(0644,root,%{runuser}) %{_sysconfdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %attr(0700,%{runuser},%{runuser}) %dir %{_localstatedir}/lib/%{name}
-%attr(0750,%{runuser},%{runuser}) %dir %{_var}/run/%{name}
 %attr(0750,%{runuser},%{runuser}) %dir %{_var}/%{name}
 %attr(0750,%{runuser},%{runuser}) %dir %{_logdir}/%{name}
 %{_sysconfdir}/bash_completion.d/%{name}