From 05bab31c624b984b3e85083b2408d20983211c72 Mon Sep 17 00:00:00 2001
From: Miloš Jakubíček <mjakubicek@fedoraproject.org>
Date: Mar 08 2009 20:50:59 +0000
Subject: - fix boincmgr wrapper script to honour data dir


---

diff --git a/boinc-client.spec b/boinc-client.spec
index e229ddf..46df84e 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -176,11 +176,24 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}/upper_case
 pushd $RPM_BUILD_ROOT%{_bindir}
 ln -s boinc_client boinc
 mv boinc_cmd boinccmd
-cat > boincmgr <<-EOF
-	#!/bin/bash
-	# wrapper script to allow passwordless manager connections from users of the boinc group
-	cd %{_localstatedir}/lib/boinc
-	boinc_gui
+cat > boincmgr <<EOF
+#!/bin/bash
+# wrapper script to allow passwordless manager connections from users of the boinc group
+
+# Look for any local configuration settings of \$BOINCDIR
+if [ -f %{_sysconfdir}/sysconfig/%{name} ]; then
+	. %{_sysconfdir}/sysconfig/%{name} 
+elif [ -f %{_sysconfdir}/default/%{name} ]; then
+	. %{_sysconfdir}/default/%{name}
+fi
+
+# Otherwise pull \$BOINCDIR from the init script
+if [ -z \$BOINCDIR ]; then
+	BOINCDIR='\`grep "BOINCDIR=" %{_sysconfdir}/init.d/%{name} | sed "s|BOINCDIR=||"\`';
+fi
+
+cd \$BOINCDIR
+boinc_gui
 EOF
 chmod a+x boincmgr
 popd
@@ -303,9 +316,8 @@ fi
 * Sun Mar 08 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 6.4.7-2.r17542svn
 - Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script
   (BZ#489199).
-- Fix reference to sample sysconfig configuration file (boinc-client instead of
-  boinc).
 - Fixed boinc-gccflags.patch
+- Honour data dir in boincmgr wrapper script.
 
 * Fri Mar 06 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 6.4.7-1.r17542svn
 - i386 arch conditional replaced by the %%{ix86} macro.