diff --git a/import.log b/import.log index 4df5bf3..564be97 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ mumble-1_1_8-13_fc10:HEAD:mumble-1.1.8-13.fc10.src.rpm:1243002419 mumble-1_2_2-5_fc12:HEAD:mumble-1.2.2-5.fc12.src.rpm:1271584034 mumble-1_2_2-6_fc12:HEAD:mumble-1.2.2-6.fc12.src.rpm:1271589139 +mumble-1_2_2-7_fc12:HEAD:mumble-1.2.2-7.fc12.src.rpm:1273406699 diff --git a/mumble.spec b/mumble.spec index 7197416..1f229d7 100644 --- a/mumble.spec +++ b/mumble.spec @@ -1,6 +1,6 @@ Name: mumble Version: 1.2.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Voice chat suite aimed at gamers Group: Applications/Internet @@ -129,7 +129,7 @@ ln -s libmumble.so.%{version} %{buildroot}%{_libdir}/%{name}/libmumble.so.1.2 mkdir -p %{buildroot}%{_sysconfdir}/murmur/ install -pD scripts/murmur.ini.system %{buildroot}%{_sysconfdir}/murmur/murmur.ini -ln -s ../etc/murmur/murmur.ini %{buildroot}%{_sysconfdir}/%{name}-server.ini +ln -s /etc/murmur/murmur.ini %{buildroot}%{_sysconfdir}/%{name}-server.ini install -pD -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/murmur mkdir -p %{buildroot}%{_datadir}/%{name}/ @@ -264,6 +264,9 @@ fi %{_datadir}/kde4/services/mumble.protocol %changelog +* Sun May 2 2010 Andreas Osowski - 1.2.2-7 +- Fixed murmur's init script + * Sun Apr 18 2010 Andreas Osowski - 1.2.2-6 - Fix for missing dbus-qt-devel on >F12 diff --git a/murmur.init b/murmur.init index 4113f69..180e905 100644 --- a/murmur.init +++ b/murmur.init @@ -9,25 +9,26 @@ # voip suite aimed at gamers # processname: murmur # config: /etc/mumble-server.ini -# pidfile: /var/run/murmur.pid +# pidfile: /var/run/mumble-server/mumble-server.pid # Source function library. . /lib/lsb/init-functions +. /etc/rc.d/init.d/functions -prog=murmur +prog=murmurd lockfile=/var/lock/subsys/murmur RETVAL=0 INIFILE=/etc/mumble-server.ini -MURMUR_USER=murmur -MURMUR_GROUP=murmur -MURMUR_PIDFILE=/var/run/murmur/murmur.pid +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 $prog --PIDFile "$pidfile" --chuid: $MURMUR_USER:$MURMUR_GROUP --RunAsDaemon 1 $MURMUR_OPTS + start_daemon -u $MURMUR_USER -p $pidfile $prog $MURMUR_OPTS RETVAL=$? if [ $RETVAL -eq 0 ]; then touch "$lockfile" && success || failure @@ -37,12 +38,12 @@ start() { stop() { echo -n "Shutting down murmur: " - killproc $prog -INT && success || failure + killproc $prog -INT RETVAL=$? - echo if [ $RETVAL -eq 0 ]; then /bin/rm "$lockfile" "$pidfile" 2> /dev/null && success || failure fi + echo } restart() { @@ -70,7 +71,7 @@ case "$1" in [ -f "$lockfile" ] && restart ;; *) - echo "Usage: {start|stop|status|restart|reload|force-reload|condrestart" + echo "Usage: {start|stop|status|restart|reload|force-reload|condrestart}" exit 1 ;; esac