packages: Canna/Canna.init, Canna/Canna.spec - rel 3 - properly start daemo...

[baggins]

Author: baggins                      Date: Tue Jul 26 09:42:18 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- properly start daemon in init script
- fix canna user home

---- Files affected:
packages/Canna:
   Canna.init (1.5 -> 1.6) , Canna.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/Canna/Canna.init
diff -u packages/Canna/Canna.init:1.5 packages/Canna/Canna.init:1.6
--- packages/Canna/Canna.init:1.5	Thu Dec  8 02:02:48 2005
+++ packages/Canna/Canna.init	Tue Jul 26 11:42:13 2011
@@ -17,7 +17,7 @@
 	if [ ! -f /var/lock/subsys/canna ]; then
 		msg_starting Canna
 		rm -f /tmp/.iroha_unix/IROHA
-		daemon "su - canna -s /bin/sh -c '/usr/sbin/cannaserver -syslog'"
+		daemon --user canna /usr/sbin/cannaserver -syslog
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/canna
 	else

================================================================
Index: packages/Canna/Canna.spec
diff -u packages/Canna/Canna.spec:1.30 packages/Canna/Canna.spec:1.31
--- packages/Canna/Canna.spec:1.30	Tue Jul 12 22:59:42 2011
+++ packages/Canna/Canna.spec	Tue Jul 26 11:42:13 2011
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 %define	_ver	%(echo %{version} | tr -d .)
 %define	_rc		p3
-%define	_rel	2
+%define	_rel	3
 Summary:	Japanese input system
 Summary(ja.UTF-8):	日本語入力システム
 Summary(pl.UTF-8):	System wprowadzania znaków japońskich
@@ -154,9 +154,12 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerpostun -- canna < 3.7-p3.3
+usermod -d %{_datadir}/canna canna
+
 %pre
 %groupadd -g 41 canna
-%useradd -u 41 -d /var/lib/canna -s /bin/false -c "Canna Service User" -g canna canna
+%useradd -u 41 -d %{_datadir}/canna -s /bin/false -c "Canna Service User" -g canna canna
 
 %post
 /sbin/chkconfig --add canna
@@ -234,6 +237,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2011/07/26 09:42:13  baggins
+- rel 3
+- properly start daemon in init script
+- fix canna user home
+
 Revision 1.30  2011/07/12 20:59:42  baggins
 - rel 2
 - parallel make ja nai
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Canna/Canna.init?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Canna/Canna.spec?r1=1.30&r2=1.31&f=u