[tor/f18] Whitespace changes to sync with spec from master

[Jamie Nguyen]

commit 88cb1e7bdd86ef29126349794f014acdc73b26b1
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Mar 4 23:09:54 2013 +0000

    Whitespace changes to sync with spec from master

 tor.spec |   59 +++++++++++++++++++++++++++--------------------------------
 1 files changed, 27 insertions(+), 32 deletions(-)
---
diff --git a/tor.spec b/tor.spec
index 3ad3035..a40418e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -5,38 +5,38 @@
 %global homedir     %{_localstatedir}/lib/%{name}
 %global logdir      %{_localstatedir}/log/%{name}
 
-Name:           tor
-Version:        0.2.3.25
-Release:        1802%{?dist}
-Group:          System Environment/Daemons
-License:        BSD
-Summary:        Anonymizing overlay network for TCP (The onion router)
-URL:            https://www.torproject.org
-
-Source0:        https://www.torproject.org/dist/%{name}-%{version}.tar.gz
-Source1:        https://www.torproject.org/dist/%{name}-%{version}.tar.gz.asc
+Name:       tor
+Version:    0.2.3.25
+Release:    1802%{?dist}
+Group:      System Environment/Daemons
+License:    BSD
+Summary:    Anonymizing overlay network for TCP (The onion router)
+URL:        https://www.torproject.org
+
+Source0:    https://www.torproject.org/dist/%{name}-%{version}.tar.gz
+Source1:    https://www.torproject.org/dist/%{name}-%{version}.tar.gz.asc
 # Upstream ship their own logrotate file. Ours only has 2 modifications:
 # use 'toranon' user, and use systemctl to reload.
-Source2:        tor.logrotate
+Source2:    tor.logrotate
 # This makes sure tor runs as 'toranon', logs to syslog at 'notice' level,
 # and writes to /var/lib/tor instead of /root/.tor directory.
-Source3:        tor.defaults-torrc
+Source3:    tor.defaults-torrc
 # A ticket has been opened to have the systemd service included upstream:
 # https://trac.torproject.org/projects/tor/ticket/8368
-Source10:       tor.systemd.service
+Source10:   tor.systemd.service
 
 # Obsoletes/Provides for tor-core, tor-systemd and torify were introduced
 # in Fedora 19 (rawhide).
-Obsoletes:      tor-core    < 0:0.2.3.25-1801
-Provides:       tor-core    = 0:%{version}-%{release}
-Obsoletes:      tor-systemd < 0:0.2.3.25-1801
-Provides:       tor-systemd = 0:%{version}-%{release}
-Obsoletes:      torify      < 0:0.2.3.25-1801
-Provides:       torify      = 0:%{version}-%{release}
+Obsoletes:  tor-core    < 0:0.2.3.25-1801
+Provides:   tor-core    = 0:%{version}-%{release}
+Obsoletes:  tor-systemd < 0:0.2.3.25-1801
+Provides:   tor-systemd = 0:%{version}-%{release}
+Obsoletes:  torify      < 0:0.2.3.25-1801
+Provides:   torify      = 0:%{version}-%{release}
 
-BuildRequires:  asciidoc
-BuildRequires:  libevent-devel
-BuildRequires:  openssl-devel
+BuildRequires:    asciidoc
+BuildRequires:    libevent-devel
+BuildRequires:    openssl-devel
 
 # /usr/bin/torify is now just a wrapper for torsocks and is only there for
 # backwards compatibility.
@@ -78,20 +78,15 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-
-mv $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc{.sample,}
-sed -i -e "s|#DataDirectory.*$|DataDirectory %{homedir}/.tor|g" \
+mv $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc.sample \
     $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc
 
 mkdir -p $RPM_BUILD_ROOT%{logdir}
 mkdir -p $RPM_BUILD_ROOT%{homedir}
 
-install -D -p -m 0644 %{SOURCE10} \
-    $RPM_BUILD_ROOT%_unitdir/%{name}.service
-install -D -p -m 0644 %{SOURCE2} \
-    $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tor
-install -D -p -m 0644 %{SOURCE3} \
-    $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults-torrc
+install -D -p -m 0644 %SOURCE10 $RPM_BUILD_ROOT%_unitdir/%{name}.service
+install -D -p -m 0644 %SOURCE2  $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tor
+install -D -p -m 0644 %SOURCE3  $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults-torrc
 
 
 %pre
@@ -108,7 +103,7 @@ exit 0
 %systemd_preun %{name}.service
 
 %postun
-%systemd_postun %{name}.service
+%systemd_postun_with_restart %{name}.service
 
 
 %files