Fix the rpm build: we need to list all our files in the files section. Also, put...

svn:r14778

diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 21fba9177409e6d0750c474a76ac7d7cccdfa94f..30748eed8121a1b882d2283341538c08c15fc685 100644 (file)
--- a/src/config/Makefile.am
+++ b/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:

diff --git a/tor.spec.in b/tor.spec.in
index ef73745a3041b4eb81b6d3b455b9a68eb24ce9ca..89c8f7ab0d61911bcdc6e91010263bacc975b6f4 100644 (file)
--- a/tor.spec.in
+++ b/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}/