Browse code

update to rpm instructions from ondrej (bug 12734)

Roger Dingledine authored on29/07/2014 19:46:57
Showing1 changed files
... ...
@@ -27,22 +27,22 @@
27 27
     torproject.repo.  Edit this file with the following information:
28 28
     </p>
29 29
 
30
-    <h3>Fedora 19/20 and EL6 packages</h3>
30
+    <h3>Fedora 19/20 and EL6/7 packages</h3>
31 31
 
32
-    <p>For Fedora 19, Fedora 20, RHEL 6 (and clones), use following repo file - 
33
-    substitute DISTRIBUTION with one of the following: fc/19, fc/20 or el/6
34
-    according to your distribution.
32
+    <p>For Fedora 19, Fedora 20, RHEL 6, RHEL 7 (and clones), use following
33
+    repo file - substitute DISTRIBUTION with one of the following: fc/19, fc/20,
34
+    el/6, el/7 according to your distribution.
35 35
     </p>
36 36
     
37 37
 <pre>[tor]
38
-name=Tor experimental repo
38
+name=Tor repo
39 39
 enabled=1
40 40
 baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/
41 41
 gpgcheck=1
42 42
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
43 43
 
44 44
 [tor-source]
45
-name=Tor experimental source repo
45
+name=Tor source repo
46 46
 enabled=1
47 47
 autorefresh=0
48 48
 baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
... ...
@@ -55,6 +55,19 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.a
55 55
     </p>
56 56
 <pre>3B9E EEB9 7B1E 827B CF0A  0D96 8AF5 653C 5AC0 01F1</pre>
57 57
 
58
+    <h3>Name clash warning</h3>
59
+
60
+    <p>There is identically named 'tor' package in the EPEL and Fedora
61
+    repositories. Due to this unfortunate name clash, the packages might
62
+    "update over one another", depending on patchversion.  Solution is to use
63
+    <tt>Exclude=tor</tt> line in the relevant <tt>/etc/yum.repos.d/</tt>
64
+    file.
65
+    </p> 
66
+    
67
+    <p>E.g. you may exclude EPEL's Tor package by putting the mentioned exclude
68
+    line under [epel] section in <tt>/etc/yum.repos.d/epel.repo</tt>.
69
+    </p>
70
+    
58 71
     <h3>Package installation and running</h3>
59 72
 
60 73
     <p>