rpms/gmediaserver/devel gmediaserver.conf, 1.1, 1.2 gmediaserver.init, 1.3, 1.4 gmediaserver.spec, 1.8, 1.9

[Karol Trzcionka (karlik)]

Author: karlik

Update of /cvs/pkgs/rpms/gmediaserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16952

Modified Files:
	gmediaserver.conf gmediaserver.init gmediaserver.spec 
Log Message:
Change mediadir
Fix initscript according to guidelines



Index: gmediaserver.conf
===================================================================
RCS file: /cvs/pkgs/rpms/gmediaserver/devel/gmediaserver.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gmediaserver.conf	21 Apr 2007 21:31:33 -0000	1.1
+++ gmediaserver.conf	26 Jun 2008 20:05:28 -0000	1.2
@@ -1,6 +1,6 @@
 #directory with media files
-#default is /srv/gmediaserver
-dir=/srv/gmediaserver
+#default is /var/lib/gmediaserver
+dir=/var/lib/gmediaserver
 
 #file for logging if NULL or hashed, logging is off
 logfile=/var/log/gmediaserver/gmediaserver.log


Index: gmediaserver.init
===================================================================
RCS file: /cvs/pkgs/rpms/gmediaserver/devel/gmediaserver.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gmediaserver.init	18 Nov 2007 21:33:36 -0000	1.3
+++ gmediaserver.init	26 Jun 2008 20:05:28 -0000	1.4
@@ -24,14 +24,16 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-gserv=${gserv-/usr/sbin/gmediaserver}
+exec="/usr/sbin/gmediaserver"
 prog=gmediaserver
 user=gmediaserver
-pidfile=/var/run/gmediaserver.pid
-lockfile=/var/lock/subsys/gmediaserver
-RETVAL=0
+config="/etc/sysconfig/$prog"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
 
-. /etc/sysconfig/$prog
+RETVAL=0
 
 OPTIONS="-b "
 [ $logfile ] && OPTIONS="$OPTIONS --output=$logfile";
@@ -46,13 +48,16 @@
 [ $profile ] && OPTIONS="$OPTIONS --profile=$profile ";
 [ $filetypes ] && OPTIONS="$OPTIONS --file-types=$filetypes ";
 [ $expiretime ] && OPTIONS="$OPTIONS --expire-time=$expiretime ";
-[ -d "$dir" ] || dir=/srv/gmediaserver;
+[ -d "$dir" ] || dir=/var/lib/gmediaserver;
 OPTIONS="$OPTIONS $dir";
 
 start()
 {
-	echo -n "Starting $prog: "
-        daemon --user=$user $gserv $OPTIONS
+	[ -x $exec ] || exit 5
+	[ -f $config ] || exit 6
+	[ $logfile ] && [ ! -e $logfile ] && touch $logfile
+	echo -n $"Starting $prog: "
+        daemon --user=$user $prog $OPTIONS
         RETVAL=$?
         echo
         [ $RETVAL = 0 ] && touch ${lockfile}
@@ -61,36 +66,60 @@
 
 stop()
 {
-	echo -n "Stopping $prog: "
-	killproc -d 10 $gserv
+	echo -n $"Stopping $prog: "
+	killproc -d 10 $prog
 	RETVAL=$?
 	echo
-	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
-	echo ""
+	[ $RETVAL = 0 ] && rm -f ${lockfile}
+	echo
 	return $RETVAL
 }
 
+restart() {
+	stop
+	start
+}
+
+reload() {
+	restart
+}
+
+force_reload() {
+	restart
+}
+
+status_q() {
+	status $prog >/dev/null 2>&1
+}	    
+
 case "$1" in
   start)
-	start
+  	status_q && exit 0 
+	$1
 	;;
   stop)
-	stop
+  	status_q || exit 0
+	$1
 	;;
-  restart|reload|force-reload)
-        stop
-        start
-        ;;
-  try-restart)
-        [ -e /var/lock/subsys/gmediaserver ] && (stop; start)
+  restart)
+  	$1
+	;;
+  reload)
+	status_q || exit 7
+	;;
+  force-reload)
+        force_reload
         ;;
   status)
-        status $gserv
-	RETVAL=$?
+        status $prog
         ;;
+  condrestart|try-restart)
+        status_q || exit 0
+	restart
+	;;
   *)
-        echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|try-restart}"
-        exit 2
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+	exit 2
 	;;
 esac
 


Index: gmediaserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmediaserver/devel/gmediaserver.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gmediaserver.spec	9 Feb 2008 15:33:37 -0000	1.8
+++ gmediaserver.spec	26 Jun 2008 20:05:28 -0000	1.9
@@ -1,7 +1,7 @@
-%define mediadir /srv/gmediaserver
+%define mediadir /var/lib/gmediaserver
 Name:           gmediaserver
 Version:        0.13.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        UPnP compatible media server for the GNU system
 
 Group:          Applications/Multimedia
@@ -19,7 +19,7 @@
 Requires(post): /sbin/install-info /sbin/chkconfig
 Requires(preun): /sbin/install-info /sbin/chkconfig
 Requires: logrotate initscripts
-Requires(pre): shadow-utils
+Requires(pre,postun): shadow-utils
 
 %description
 GMediaServer is a UPnP compatible media server for the GNU system. It is part
@@ -38,7 +38,10 @@
 %build
 %configure  --disable-rpath --disable-static
 make %{?_smp_mflags}
-
+iconv -f ISO88591 -t UTF8 AUTHORS > AUTHORSfixed
+iconv -f ISO88591 -t UTF8 NEWS > NEWSfixed
+mv -f AUTHORSfixed AUTHORS
+mv -f NEWSfixed NEWS
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,10 +72,15 @@
 /sbin/chkconfig --add %{name} || :
 
 %pre
-groupadd -f -r gmediaserver
-id gmediaserver >/dev/null 2>&1 || \
-useradd -r -g gmediaserver -d %{mediadir} -s /sbin/nologin \
-    -c "gmediaserver" gmediaserver
+#groupadd -f -r gmediaserver
+#id gmediaserver >/dev/null 2>&1 || \
+#useradd -r -g gmediaserver -d %{mediadir} -s /sbin/nologin \
+#    -c "gmediaserver" gmediaserver
+getent group %{name} >/dev/null || groupadd -r %{name}
+getent passwd %{name} >/dev/null || \
+useradd -r -g %{name} -d %{mediadir} -s /sbin/nologin \
+	-c "gmediaserver daemon user" %{name}
+exit 0
 
 %preun
 if [ $1 = 0 ]; then
@@ -81,11 +89,11 @@
     /sbin/chkconfig --del %{name} || :
 fi
 
-#%postun
-#if [ $1 = 0 ]; then
-#    /usr/sbin/userdel  gmediaserver &>/dev/null || :
-#    /usr/sbin/groupdel gmediaserver &>/dev/null || :
-#fi
+%postun
+if [ "$1" -ge "1" ] ; then
+[ `getent passwd %{name} | cut -d: -f6` !=  %{mediadir} ] && usermod -d %{mediadir} %{name}
+/sbin/service %{name} condrestart >/dev/null 2>&1 || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -101,6 +109,11 @@
 %attr(-,%{name},%{name}) %{mediadir}
 
 %changelog
+* Thu Jun 26 2008 Karol Trzcionka <karlikt at gmail.com> - 0.13.0-4
+- Change mediadir
+- Fix initscript according to guidelines
+- Add condrestart in %%postun
+- Some changes in %%pre section
 * Sat Feb 09 2008 Karol Trzcionka <karlikt at gmail.com> - 0.13.0-3
 - respin (gcc43)
 * Mon Nov 19 2007 Karol Trzcionka <karlikt at gmail.com> - 0.13.0-2