--- cauldron/tor/current/SPECS/tor.spec 2012/01/15 22:09:07 196573 +++ cauldron/tor/current/SPECS/tor.spec 2012/01/15 22:28:56 196574 @@ -2,7 +2,7 @@ Name: tor Version: 0.2.2.35 -Release: %mkrel 1 +Release: %mkrel 2 Summary: Anonymizing overlay network for TCP (The onion router) URL: http://www.torproject.org/ Group: Networking/Other @@ -11,6 +11,9 @@ Requires(post): rpm-helper Requires(preun): rpm-helper Requires(postun): rpm-helper +Requires(post): sysvinit +Requires(preun): sysvinit +Requires(postun): sysvinit Requires: openssl >= 0.9.6 Requires: tsocks BuildRequires: openssl-devel >= 0.9.6 @@ -23,6 +26,7 @@ Source1: %{name}.logrotate Source2: %{name}.init Source3: %{name}.sysconfig +Source4: tor.systemd.service %description Tor is a connection-based low-latency anonymous communication system. @@ -78,6 +82,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/bash_completion.d echo 'complete -F _command $filenames torify' > ${RPM_BUILD_ROOT}%{_sysconfdir}/bash_completion.d/%{name} +# Systemd support +install -D -p -m 0644 %SOURCE4 $RPM_BUILD_ROOT%_unitdir/%name.service + %pre %_pre_useradd %{runuser} / /bin/false @@ -104,6 +111,7 @@ %{_bindir}/tor-resolve %{_bindir}/tor-gencert %config(noreplace) %attr(0755,%{runuser},%{runuser}) %{_initrddir}/%{name} +%_unitdir/%name.service %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} %dir %attr(0755,root,%{runuser}) %{_sysconfdir}/%{name}/ %config(noreplace) %attr(0644,root,%{runuser}) %{_sysconfdir}/%{name}/* @@ -114,4 +122,3 @@ %{_sysconfdir}/bash_completion.d/%{name} %{_datadir}/%{name} -