[or-cvs] r14795: Backport: Do not ship a fallback-consensus until the related (in tor/branches/tor-0_2_0-patches: . src/config)

[nickm at seul.org]

Author: nickm
Date: 2008-05-28 20:54:28 -0400 (Wed, 28 May 2008)
New Revision: 14795

Modified:
   tor/branches/tor-0_2_0-patches/src/config/Makefile.am
   tor/branches/tor-0_2_0-patches/tor.spec.in
Log:
Backport: Do not ship a fallback-consensus until the related bugs are fixed.

Modified: tor/branches/tor-0_2_0-patches/src/config/Makefile.am
===================================================================
--- tor/branches/tor-0_2_0-patches/src/config/Makefile.am	2008-05-29 00:54:08 UTC (rev 14794)
+++ tor/branches/tor-0_2_0-patches/src/config/Makefile.am	2008-05-29 00:54:28 UTC (rev 14795)
@@ -1,11 +1,11 @@
 confdir = $(sysconfdir)/tor
 tordatadir = $(datadir)/tor
 
-EXTRA_DIST = fallback-consensus geoip
+EXTRA_DIST = geoip
 
 conf_DATA = torrc.sample
 
-tordata_DATA = fallback-consensus geoip
+tordata_DATA = geoip
 
 # If we don't have it, fake it.
 fallback-consensus:

Modified: tor/branches/tor-0_2_0-patches/tor.spec.in
===================================================================
--- tor/branches/tor-0_2_0-patches/tor.spec.in	2008-05-29 00:54:08 UTC (rev 14794)
+++ tor/branches/tor-0_2_0-patches/tor.spec.in	2008-05-29 00:54:28 UTC (rev 14795)
@@ -289,7 +289,6 @@
 %{_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}