Do not ship a fallback-consensus until the related bugs are fixed.

svn:r14794

diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 30748eed8121a1b882d2283341538c08c15fc685..90dd218b40795538ba9a69eeb543bac9f694d426 100644 (file)
--- a/src/config/Makefile.am
+++ b/src/config/Makefile.am
@@ -2,11 +2,13 @@ confdir = $(sysconfdir)/tor
 
 tordatadir = $(datadir)/tor
 
-EXTRA_DIST = fallback-consensus geoip
+EXTRA_DIST = geoip
+# fallback-consensus
 
 conf_DATA = torrc.sample
 
-tordata_DATA = fallback-consensus geoip
+tordata_DATA = geoip
+# fallback_consensus
 
 # If we don't have it, fake it.
 fallback-consensus:

diff --git a/tor.spec.in b/tor.spec.in
index 89c8f7ab0d61911bcdc6e91010263bacc975b6f4..a600e6c6b9a69ca89fcfc330c029109fe064d8f4 100644 (file)
--- a/tor.spec.in
+++ b/tor.spec.in
@@ -287,7 +287,6 @@ exit 0
 %{_bindir}/torify
 %{_bindir}/tor-resolve
 %{_bindir}/tor-gencert
-%{_datadir}/tor/fallback-consensus
 %{_datadir}/tor/geoip
 %config %{_initrddir}/%{name}
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}