From b206123140dae8424aee205a0c3f531db07d29ba Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 28 May 2008 17:19:19 +0000
Subject: [PATCH] Backport: 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:r14779
---
 src/config/Makefile.am | 3 ++-
 tor.spec.in            | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 21fba9177..5345b9f1e 100644
--- a/src/config/Makefile.am
+++ b/src/config/Makefile.am
@@ -1,10 +1,11 @@
 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 6036de5ed..6c72ecc98 100644
--- a/tor.spec.in
+++ b/tor.spec.in
@@ -289,6 +289,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}/