- rel 3

- properly start daemon in init script
- fix canna user home

Changed files:
    Canna.init -> 1.6
    Canna.spec -> 1.31

diff --git a/Canna.init b/Canna.init
index 98207e407cf99e23460d09a14996f563a0b5244a..a26158a090001576dd93ca065a8bc65b1211fde6 100644 (file)
--- a/Canna.init
+++ b/Canna.init
@@ -17,7 +17,7 @@ case "$1" in
        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

diff --git a/Canna.spec b/Canna.spec
index 6c9847d3f7455c1f581aed46413af327c97d6a23..2dbb6c25e2c77b60e91cc6eb754f5805aff532ba 100644 (file)
--- a/Canna.spec
+++ b/Canna.spec
@@ -1,6 +1,6 @@
 %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
@@ -153,9 +153,12 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/man
 %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