rpms/tetrinetx/F-8 tetrinetx.init,1.1,1.2 tetrinetx.spec,1.1,1.2
Francois Aucamp (faucamp)
fedora-extras-commits at redhat.com
Tue Jan 15 15:56:33 UTC 2008
Author: faucamp
Update of /cvs/pkgs/rpms/tetrinetx/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24004
Modified Files:
tetrinetx.init tetrinetx.spec
Log Message:
- Changed initscript to comply with LSB standard
- Fixed package License field
Index: tetrinetx.init
===================================================================
RCS file: /cvs/pkgs/rpms/tetrinetx/F-8/tetrinetx.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetrinetx.init 15 Mar 2007 07:43:33 -0000 1.1
+++ tetrinetx.init 15 Jan 2008 15:55:59 -0000 1.2
@@ -1,59 +1,103 @@
-#!/bin/bash
+#!/bin/sh
#
-# tetrinetx Starts, Stops and Restarts the GNU TetriNET server
+# tetrinetx Starts, stops and restarts the GNU TetriNET server
#
-# chkconfig: - 98 01
+# chkconfig: - 98 01
# description: The GNU TetriNET server daemon
# processname: tetrinetx
# config: /etc/tetrinetx/game.conf
# pidfile: /var/run/tetrinetx.pid
-SERVICE_DISPLAYNAME="TetriNET server"
-SERVICE_NAME=tetrinetx
-SERVICE_USER=tetrinetx
-SERVICE_BIN=/usr/bin/tetrinetx
+### BEGIN INIT INFO
+# Provides: tetrinetx
+# Should-Start: $network
+# Description: The GNU TetriNET server daemon
+# Short-Description: Starts, stops and restarts the GNU TetriNET server
+### END INIT INFO
# Source function library.
-. /etc/init.d/functions
+. /etc/rc.d/init.d/functions
+
+display_name="TetriNET server"
+exec="/usr/bin/tetrinetx"
+prog="tetrinetx"
+prog_user="tetrinetx"
+config="/etc/tetrinetx/game.conf"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
start() {
- echo -n "Starting $SERVICE_DISPLAYNAME: "
- daemon --user $SERVICE_USER "$SERVICE_BIN > /dev/null"
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE_NAME
- echo
- return $RETVAL
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $display_name: "
+ daemon --user $prog_user "$exec > /dev/null"
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
}
stop() {
- echo -n "Shutting down $SERVICE_DISPLAYNAME: "
- killproc $SERVICE_BIN
- RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$SERVICE_NAME
- echo
- return $RETVAL
+ echo -n $"Stopping $display_name: "
+ killproc $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
}
+force_reload() {
+ restart
+}
+
+rh_status() {
+ status $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
+
case "$1" in
start)
- start
- ;;
+ rh_status_q && exit 0
+ $1
+ ;;
stop)
- stop
- ;;
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
+ ;;
+ force-reload)
+ force_reload
+ ;;
status)
- status $SERVICE_BIN
- ;;
- restart|reload)
- stop
- start
- ;;
- condrestart)
- [ -f /var/lock/subsys/$SERVICE_NAME ] && stop && start || :
- ;;
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
*)
- echo "Usage: $SERVICE_NAME {start|stop|status|reload|restart|condrestart}"
- exit 1
- ;;
+ echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+ exit 2
esac
-exit $?
+exit $?
\ No newline at end of file
Index: tetrinetx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tetrinetx/F-8/tetrinetx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetrinetx.spec 15 Mar 2007 07:43:33 -0000 1.1
+++ tetrinetx.spec 15 Jan 2008 15:55:59 -0000 1.2
@@ -1,10 +1,10 @@
Name: tetrinetx
Version: 1.13.16
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The GNU TetriNET server
Group: Amusements/Games
-License: GPL
+License: GPLv2
URL: http://tetrinetx.sourceforge.net/
Source0: http://switch.dl.sourceforge.net/sourceforge/tetrinetx/%{name}-%{version}+qirc-1.40c.tar.gz
Source1: tetrinetx.init
@@ -123,6 +123,10 @@
%changelog
+* Tue Jan 15 2008 Francois Aucamp <faucamp at fedoraproject.org> - 1.13.16-3
+- Changed initscript to comply with LSB standard
+- Fixed package License field
+
* Tue Mar 13 2007 Francois Aucamp <faucamp at csir.co.za> - 1.13.16-2
- Cleaned up sed scripts in %%prep
- Replaced config.h patch with sed script in order to support RPM macros
More information about the fedora-extras-commits
mailing list