Fix the rpm build: we need to list all our files in the files section. Also, put fallback-consensus and geoip file in /usr/share/tor/, not in /usr/share/

svn:r14778

src/config/Makefile.am

@@ -1,10 +1,12 @@
 confdir = $(sysconfdir)/tor
 
+tordatadir = $(datadir)/tor
+
 EXTRA_DIST = fallback-consensus geoip
 
 conf_DATA = torrc.sample
 
-data_DATA = fallback-consensus geoip
+tordata_DATA = fallback-consensus geoip
 
 # If we don't have it, fake it.
 fallback-consensus:

tor.spec.in

@@ -287,6 +287,8 @@ 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}
 %dir %attr(0755,root,%{torgroup}) %{_sysconfdir}/%{name}/