[or-cvs] r14779: Backport: Fix the rpm build: we need to list all our files i (in tor/branches/tor-0_2_0-patches: . src/config)

[nickm at seul.org]

Author: nickm
Date: 2008-05-28 13:19:19 -0400 (Wed, 28 May 2008)
New Revision: 14779

Modified:
   tor/branches/tor-0_2_0-patches/src/config/Makefile.am
   tor/branches/tor-0_2_0-patches/tor.spec.in
Log:
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/

Modified: tor/branches/tor-0_2_0-patches/src/config/Makefile.am
===================================================================
--- tor/branches/tor-0_2_0-patches/src/config/Makefile.am	2008-05-28 17:15:52 UTC (rev 14778)
+++ tor/branches/tor-0_2_0-patches/src/config/Makefile.am	2008-05-28 17:19:19 UTC (rev 14779)
@@ -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:

Modified: tor/branches/tor-0_2_0-patches/tor.spec.in
===================================================================
--- tor/branches/tor-0_2_0-patches/tor.spec.in	2008-05-28 17:15:52 UTC (rev 14778)
+++ tor/branches/tor-0_2_0-patches/tor.spec.in	2008-05-28 17:19:19 UTC (rev 14779)
@@ -289,6 +289,8 @@
 %{_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}/