rpms/mumble/F-12 import.log, 1.2, 1.3 mumble.spec, 1.4, 1.5 murmur.init, 1.2, 1.3
Andreas Osowski
th0br0 at fedoraproject.org
Sun May 9 14:17:05 UTC 2010
Author: th0br0
Update of /cvs/pkgs/rpms/mumble/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8183/F-12
Modified Files:
import.log mumble.spec murmur.init
Log Message:
Minor fixes to the murmur init script
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mumble/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 18 Apr 2010 11:40:51 -0000 1.2
+++ import.log 9 May 2010 14:17:04 -0000 1.3
@@ -1,2 +1,3 @@
mumble-1_1_8-13_fc10:HEAD:mumble-1.1.8-13.fc10.src.rpm:1243002419
mumble-1_2_2-6_fc12:F-12:mumble-1.2.2-6.fc12.src.rpm:1271590813
+mumble-1_2_2-7_fc12:F-12:mumble-1.2.2-7.fc12.src.rpm:1273414572
Index: mumble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mumble/F-12/mumble.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mumble.spec 18 Apr 2010 11:40:51 -0000 1.4
+++ mumble.spec 9 May 2010 14:17:04 -0000 1.5
@@ -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} %{buildroo
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 <th0br0 at mkdir.name> - 1.2.2-7
+- Fixed murmur's init script
+
* Sun Apr 18 2010 Andreas Osowski <th0br0 at mkdir.name> - 1.2.2-6
- Fix for missing dbus-qt-devel on >F12
Index: murmur.init
===================================================================
RCS file: /cvs/pkgs/rpms/mumble/F-12/murmur.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- murmur.init 18 Apr 2010 11:40:51 -0000 1.2
+++ murmur.init 9 May 2010 14:17:04 -0000 1.3
@@ -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: <servicename> {start|stop|status|restart|reload|force-reload|condrestart"
+ echo "Usage: <servicename> {start|stop|status|restart|reload|force-reload|condrestart}"
exit 1
;;
esac
More information about the scm-commits
mailing list