[tor/f18] Add useful comments
Jamie Nguyen
jamielinux at fedoraproject.org
Mon Mar 4 23:15:02 UTC 2013
commit eb63d1ef564d9bc1ae1a5cc69e1bdc5e1786fb75
Author: Jamie Nguyen <j at jamielinux.com>
Date: Mon Mar 4 22:58:53 2013 +0000
Add useful comments
tor.spec | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/tor.spec b/tor.spec
index 91ca292..f6526d1 100644
--- a/tor.spec
+++ b/tor.spec
@@ -15,10 +15,18 @@ URL: http://www.torproject.org
Source0: https://www.torproject.org/dist/%{name}-%{version}.tar.gz
Source1: https://www.torproject.org/dist/%{name}-%{version}.tar.gz.asc
+# Upstream ship their own logrotate file. Ours only has 2 modifications:
+# use 'toranon' user, and use systemctl to reload.
Source2: tor.logrotate
+# This makes sure tor runs as 'toranon' and writes to /var/lib/tor instead
+# of /root/.tor directory.
Source3: tor.defaults-torrc
+# A ticket has been opened to have the systemd service included upstream:
+# https://trac.torproject.org/projects/tor/ticket/8368
Source10: tor.systemd.service
+# Obsoletes/Provides for tor-core, tor-systemd and torify were introduced
+# in Fedora 19 (rawhide).
Obsoletes: tor-core < 0:0.2.3.25-1801
Provides: tor-core = 0:%{version}-%{release}
Obsoletes: tor-systemd < 0:0.2.3.25-1801
@@ -26,7 +34,11 @@ Provides: tor-systemd = 0:%{version}-%{release}
Obsoletes: torify < 0:0.2.3.25-1801
Provides: torify = 0:%{version}-%{release}
-BuildRequires: libevent-devel openssl-devel asciidoc
+BuildRequires: asciidoc
+BuildRequires: libevent-devel
+BuildRequires: openssl-devel
+
+# /usr/bin/torify depends on torsocks, as tsocks has been deprecated.
Requires: torsocks
Requires(pre): shadow-utils
Requires(post): systemd
@@ -175,6 +187,9 @@ exit 0
- the /var/run/tor directory is not needed so remove it, which also fixes
bug #656707
- use %%_localstatedir instead of %%_var
+- add some useful comments about the Obsoletes/Provides/Requires
+- add comments about tor.logrotate, tor.defaults-torrc and tor.systemd.service
+
More information about the scm-commits
mailing list