rpms/boinc-client/devel boinc-client.spec,1.28,1.29

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19750

Modified Files:
	boinc-client.spec 
Log Message:
- fix boincmgr wrapper script to honour data dir



Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- boinc-client.spec	8 Mar 2009 17:45:41 -0000	1.28
+++ boinc-client.spec	8 Mar 2009 20:50:59 -0000	1.29
@@ -176,11 +176,24 @@
 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 @@
 * Sun Mar 08 2009 Milos Jakubicek <xjakub at 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 at fi.muni.cz> - 6.4.7-1.r17542svn
 - i386 arch conditional replaced by the %%{ix86} macro.