summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-05-28 17:15:52 +0000
committerNick Mathewson <nickm@torproject.org>2008-05-28 17:15:52 +0000
commitdd715016ddb4a9c377da7586561e54237c405c03 (patch)
tree63ccf279b364ab03e49c48a489997f067ca982f2
parent02c26de8342e8b3658b933084df508ac0c890b6f (diff)
downloadtor-dd715016ddb4a9c377da7586561e54237c405c03.tar.gz
tor-dd715016ddb4a9c377da7586561e54237c405c03.zip
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
-rw-r--r--src/config/Makefile.am4
-rw-r--r--tor.spec.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 21fba91774..30748eed81 100644
--- 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 ef73745a30..89c8f7ab0d 100644
--- 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}/