[boinc-client/f17] - Fixed naming systemd service file - Fixed logging to /var/log/boinc.log and /var/log/boincerr.log

[Miloš Jakubíček]

commit 51641764f62d8550bc8852a94e3bf2a36b213e22
Author: Milos Jakubicek <xjakub at fi.muni.cz>
Date:   Fri Jun 22 14:29:14 2012 +0200

    - Fixed naming systemd service file
    - Fixed logging to /var/log/boinc.log and /var/log/boincerr.log

 boinc-client-systemd |    2 +-
 boinc-client.spec    |   16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/boinc-client-systemd b/boinc-client-systemd
index 612798f..c4aa847 100644
--- a/boinc-client-systemd
+++ b/boinc-client-systemd
@@ -8,7 +8,7 @@ User=boinc
 CPUShares=2
 ControlGroup=cpu:/background
 ExecStartPre=/bin/sleep 1
-ExecStart=/usr/bin/boinc_client --dir /var/lib/boinc
+ExecStart=/usr/bin/boinc_client --dir /var/lib/boinc --redirectio
 ExecReload=/usr/bin/boinccmd --read_cc_config
 
 [Install]
diff --git a/boinc-client.spec b/boinc-client.spec
index 02646d5..fe8e7f0 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.12.43
-Release:	1.r%{revision}svn%{?dist}
+Release:	2.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -223,7 +223,7 @@ cat > boincmgr <<EOF
 # wrapper script to allow passwordless manager connections from users of the boinc group
 
 if [ -z \$BOINCDIR ]; then
-	BOINCDIR=\`grep -o -- '--dir [^ ]\+' %{_unitdir}/%{name} | tr '"' ' ' | sed 's|--dir ||'\`;
+	BOINCDIR=\`grep -o -- '--dir [^ ]\+' %{_unitdir}/%{name}.service | tr '"' ' ' | sed 's|--dir ||'\`;
 fi
 
 cd \$BOINCDIR
@@ -234,7 +234,7 @@ popd
 
 # own systemd script and logrotate configuration file
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/%{name}
+install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 # icon
@@ -252,6 +252,10 @@ desktop-file-install %{?_remove_encoding} --vendor fedora \
 # bash-completion
 install -Dp -m644 client/scripts/boinc.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client
 
+# create symlinks for logging
+ln -sf /var/log/boinc.log $RPM_BUILD_ROOT%{_localstatedir}/lib/boinc/stdoutdae.txt
+ln -sf /var/log/boincerr.log $RPM_BUILD_ROOT%{_localstatedir}/lib/boinc/stderrdae.txt
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -316,7 +320,7 @@ fi
 %{_bindir}/boinc_client
 %{_bindir}/boinccmd
 %{_bindir}/switcher
-%{_unitdir}/%{name}
+%{_unitdir}/%{name}.service
 %{_mandir}/man1/boinccmd.1.gz
 %{_mandir}/man1/boinc.1.gz
 %{_libdir}/*.so.*
@@ -351,6 +355,10 @@ fi
 %{_includedir}/boinc
 
 %changelog
+* Fri Jun 22 2012 Miloš Jakubíček <xjakub at fi.muni.cz> - 6.12.43-2.r25218svn
+- Fixed naming systemd service file
+- Fixed logging to /var/log/boinc.log and /var/log/boincerr.log
+
 * Wed Feb 08 2012 Miloš Jakubíček <xjakub at fi.muni.cz> - 6.12.43-1.r25218svn
 - Rebase the 6.12 branch to 6.12.43
 - Switch from SysVInit to systemd