[tor/f18] Remove the unnecessary /var/run/tor directory

Jamie Nguyen jamielinux at fedoraproject.org
Mon Mar 4 23:14:52 UTC 2013


commit eb9d043d29bb9b339c7aa4cd5e3f6fa7bb68e027
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Mar 4 22:53:50 2013 +0000

    Remove the unnecessary /var/run/tor directory

 tor.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/tor.spec b/tor.spec
index 89e9926..a78ea34 100644
--- a/tor.spec
+++ b/tor.spec
@@ -2,8 +2,8 @@
 
 %global toruser     toranon
 %global torgroup    toranon
-%global homedir     %_var/lib/%{name}
-%global logdir      %_var/log/%{name}
+%global homedir     %{_localstatedir}/lib/%{name}
+%global logdir      %{_localstatedir}/log/%{name}
 
 Name:           tor
 Version:        0.2.3.25
@@ -73,7 +73,6 @@ sed -i -e "s|#DataDirectory.*$|DataDirectory %{homedir}/.tor|g" \
 
 mkdir -p $RPM_BUILD_ROOT%{logdir}
 mkdir -p $RPM_BUILD_ROOT%{homedir}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/tor
 
 install -D -p -m 0644 %{SOURCE10} \
     $RPM_BUILD_ROOT%_unitdir/%{name}.service
@@ -120,7 +119,6 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/tor
 %attr(0700,%{toruser},%{torgroup}) %dir %{homedir}
 %attr(0700,%{toruser},%{torgroup}) %dir %{logdir}
-%attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/run/tor
 
 
 %changelog
@@ -172,6 +170,10 @@ exit 0
 - take a more cautious approach in the %%files section and specify filenames
   more explicitly rather than using wildcards, which also makes it easier to
   see the contents of the package
+- the /var/run/tor directory is not needed so remove it, which also fixes
+  bug #656707
+- use %%_localstatedir instead of %%_var
+
 
 
 


More information about the scm-commits mailing list