[mumble] * Sun May 16 2010 Andreas Osowski <th0br0 at mkdir.name> - 1.2.2-8 - Rebuild for protobuf ABI change -

[Andreas Osowski]

commit e6b8189ca28f74295dfecfd49bb2b26b659faf41
Author: Andreas Osowski <th0br0 at mkdir.name>
Date:   Tue Aug 3 23:21:20 2010 -0400

    * Sun May 16 2010 Andreas Osowski <th0br0 at mkdir.name> - 1.2.2-8
    - Rebuild for protobuf ABI change
    - Added redhat-lsb to the Requires for murmur

 mumble.spec |    2 +-
 murmur.init |   21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/mumble.spec b/mumble.spec
index b74d3dc..2dd6673 100644
--- a/mumble.spec
+++ b/mumble.spec
@@ -240,7 +240,7 @@ fi
 %doc scripts/murmur.pl scripts/murmur-user-wrapper
 #%attr(-,mumble-server,mumble-server) %{_sbindir}/murmur
 %attr(-,mumble-server,mumble-server) %{_sbindir}/murmurd
-%attr(-,mumble-server,mumble-server) %{_initrddir}/murmur
+%{_initrddir}/murmur
 %{_sbindir}/%{name}-server
 %config(noreplace) %attr(664,mumble-server,mumble-server) %{_sysconfdir}/murmur/murmur.ini
 %config(noreplace) %attr(664,mumble-server,mumble-server) %{_sysconfdir}/mumble-server.ini
diff --git a/murmur.init b/murmur.init
index 180e905..70f3200 100644
--- a/murmur.init
+++ b/murmur.init
@@ -11,29 +11,35 @@
 # config: /etc/mumble-server.ini
 # pidfile: /var/run/mumble-server/mumble-server.pid
 
-# Source function library.
 
-. /lib/lsb/init-functions
 . /etc/rc.d/init.d/functions
 
 prog=murmurd
-lockfile=/var/lock/subsys/murmur
+lockfile=/var/lock/subsys/murmurd
 RETVAL=0
 INIFILE=/etc/mumble-server.ini
 MURMUR_USER=mumble-server
 MURMUR_GROUP=mumble-server
-MURMUR_PIDFILE=/var/run/mumble-server/mumble-server.pid
 MURMUR_OPTS="-ini $INIFILE"
-pidfile=$MURMUR_PIDFILE
 
 start() {
         echo -n "Starting murmur: "
-	start_daemon -u $MURMUR_USER -p $pidfile $prog  $MURMUR_OPTS
+	
+	status $prog &> /dev/null # Murmur is running
+	RETVAL=$?
+	if [ $RETVAL -eq 0 ]; then
+		success 
+		echo
+		return $RETVAL
+	fi
+
+	daemon "$prog $MURMUR_OPTS"
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then
 		touch "$lockfile" && success || failure
 	fi
 	echo
+	return $RETVAL
 }
 
 stop() {
@@ -41,9 +47,10 @@ stop() {
 	killproc $prog -INT
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then
-		/bin/rm "$lockfile" "$pidfile" 2> /dev/null && success || failure
+		/bin/rm "$lockfile" 2> /dev/null && success || failure
 	fi
 	echo
+	return $RETVAL
 }
 
 restart() {