diff options
author | Nick Mathewson <nickm@torproject.org> | 2008-05-28 17:19:19 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2008-05-28 17:19:19 +0000 |
commit | b206123140dae8424aee205a0c3f531db07d29ba (patch) | |
tree | b982d6861cac494caf88e3f434aaae7f27b36a7d | |
parent | 49595c40ff76e8cb9457db9a6c9b5049b39661f3 (diff) | |
download | tor-b206123140dae8424aee205a0c3f531db07d29ba.tar.gz tor-b206123140dae8424aee205a0c3f531db07d29ba.zip |
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
-rw-r--r-- | src/config/Makefile.am | 3 | ||||
-rw-r--r-- | tor.spec.in | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/config/Makefile.am b/src/config/Makefile.am index 21fba91774..5345b9f1ea 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 6036de5ed5..6c72ecc98e 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}/ |