packages: zoneminder/zoneminder.spec, zoneminder/zoneminder-init.patch (NEW...

[arekm]

Author: arekm                        Date: Mon Jul 11 17:29:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- pldize init script a bit

---- Files affected:
packages/zoneminder:
   zoneminder.spec (1.85 -> 1.86) , zoneminder-init.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/zoneminder/zoneminder.spec
diff -u packages/zoneminder/zoneminder.spec:1.85 packages/zoneminder/zoneminder.spec:1.86
--- packages/zoneminder/zoneminder.spec:1.85	Mon Jun 27 21:22:47 2011
+++ packages/zoneminder/zoneminder.spec	Mon Jul 11 19:29:42 2011
@@ -26,6 +26,7 @@
 Patch0:		zm-fedora.patch
 Patch1:		%{name}-xlib_shm.patch
 Patch2:		%{name}-build.patch
+Patch3:		%{name}-init.patch
 URL:		http://www.zoneminder.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -83,11 +84,14 @@
 
 %prep
 %setup -q -n ZoneMinder-%{version} -a4
+%undos scripts/zm.in
+
 %patch0 -p1
 cd xlib_shm-*
 %patch1 -p1
 cd ..
 %patch2 -p1
+%patch3 -p1
 
 sed -i -e 's#-frepo##g' src/Makefile.am
 sed -i -e 's#chown#true#g' -e 's#chmod#true#g' *.am */*.am */*/*.am
@@ -228,6 +232,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2011/07/11 17:29:42  arekm
+- pldize init script a bit
+
 Revision 1.85  2011/06/27 19:22:47  arekm
 - release 2
 

================================================================
Index: packages/zoneminder/zoneminder-init.patch
diff -u /dev/null packages/zoneminder/zoneminder-init.patch:1.1
--- /dev/null	Mon Jul 11 19:29:48 2011
+++ packages/zoneminder/zoneminder-init.patch	Mon Jul 11 19:29:42 2011
@@ -0,0 +1,33 @@
+--- ZoneMinder-1.24.4/scripts/zm.in.org	2011-07-11 19:20:38.227640562 +0200
++++ ZoneMinder-1.24.4/scripts/zm.in	2011-07-11 19:26:14.075758621 +0200
+@@ -45,24 +45,20 @@
+ 	[ ! -d $ZM_PATH_SOCK ] \
+ 		&& mkdir -m 774 $ZM_PATH_SOCK \
+ 		&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $ZM_PATH_SOCK
+-	echo -n $"Starting $prog: "
+-	$command start
++	msg_starting "zoneminder"
++	daemon $command start
+ 	RETVAL=$?
+-	[ $RETVAL = 0 ] && success || failure
+-	echo
+-	[ $RETVAL = 0 ] && touch $LOCKFILE
++	[ $RETVAL -eq 0 ] && touch $LOCKFILE
+ 	return $RETVAL
+ }
+ 
+ stop()
+ {
+ 	loadconf
+-	echo -n $"Stopping $prog: "
+-	$command stop
++	msg_stopping "zoneminder"
++	daemon $command stop
+ 	RETVAL=$?
+-	[ $RETVAL = 0 ] && success || failure
+-	echo
+-	[ $RETVAL = 0 ] && rm -f $LOCKFILE
++	rm -f $LOCKFILE
+ }
+ 
+ zmstatus()
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zoneminder/zoneminder.spec?r1=1.85&r2=1.86&f=u