diff options
| author | Erinn Clark <erinn@torproject.org> | 2010-08-21 00:12:26 -0700 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-09-30 21:48:29 -0400 |
| commit | 18b1097f28c57d032847ce4e6de427e19fe2f51d (patch) | |
| tree | 6b5aa410d249cb77e41b2d2848793b4ed3513da2 | |
| parent | 951340f5162bfe8906b3acf2d74bb0de5d76a6f2 (diff) | |
| download | tor-18b1097f28c57d032847ce4e6de427e19fe2f51d.tar.gz tor-18b1097f28c57d032847ce4e6de427e19fe2f51d.zip | |
Update rpm spec file so that it will build without manual intervention on all rpm-based distributions
| -rw-r--r-- | tor.spec.in | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tor.spec.in b/tor.spec.in index c0ac4ea8da..25557b73e2 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -117,6 +117,7 @@ BuildRequires: openssl-devel >= 0.9.7 %endif %if %{is_fc} BuildRequires: rpm-build >= 4.0 +Conflicts: tor-core, tor-lsb, tor-upstart %endif Requires(pre): /usr/bin/id, /bin/date, /bin/sh Requires(pre): %{_sbindir}/useradd, %{_sbindir}/groupadd @@ -153,7 +154,7 @@ for high-stakes anonymity. %build %if %{is_suse} -%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} +%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} --docdir=%{_docdir}/%{name} %else %configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} %endif @@ -262,14 +263,20 @@ exit 0 %files %defattr(-,root,root) +%if %{is_suse} +%doc INSTALL LICENSE README ChangeLog doc/HACKING doc/TODO doc/*html +%endif %doc INSTALL LICENSE README ChangeLog doc/HACKING doc/TODO %{_mandir}/man*/* -%{_docdir}/tor/* %{_bindir}/tor %{_bindir}/torctl %{_bindir}/torify %{_bindir}/tor-resolve %{_bindir}/tor-gencert +%if %{is_suse} +%else +%{_docdir}/* +%endif %{_datadir}/tor/geoip %config %{_initrddir}/%{name} %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} @@ -280,6 +287,10 @@ exit 0 %attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/log/%{name} %changelog +* Fri Aug 20 2010 Erinn Clark <erinn@torproject.org> +- add conflicts for Fedora packages +- add logic for SuSE since it requires special doc handling + * Mon Feb 22 2010 Erinn Clark <erinn@torproject.org> - remove AUTHORS from %doc line since it no longer exists upstream - switch maintainers |