rpms/Canna/devel Canna.spec,1.10,1.11 canna.init,1.1,1.2

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	Canna.spec canna.init 
Log Message:
* Sat Aug 11 2007 Akira TAGOH <tagoh at redhat.com> - 3.7p3-19
- Update an initscript with LSB standard (#246886)


Index: Canna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Canna/devel/Canna.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Canna.spec	10 Aug 2007 10:51:38 -0000	1.10
+++ Canna.spec	11 Aug 2007 05:29:50 -0000	1.11
@@ -6,7 +6,7 @@
 Summary: A Japanese character set input system.
 Name: Canna
 Version: 3.7p3
-Release: 18%{?dist}
+Release: 19%{?dist}
 # lib/RKindep/cksum.c is licensed under 4-clause BSD, otherwise MIT.
 License: MIT and BSD with advertising
 Group: System Environment/Libraries
@@ -273,7 +273,7 @@
 
 %postun
 if [ "$1" -ge "1" ]; then
-    /sbin/service canna condrestart >/dev/null 2>&1 || :
+    /sbin/service canna try-restart >/dev/null 2>&1 || :
 fi
 
 %post libs -p /sbin/ldconfig
@@ -282,10 +282,10 @@
 
 %files
 %defattr (-,root,root)
-%doc %{cannadir}/CHANGES.jp %{cannadir}/ChangeLog
-%doc %{cannadir}/OCHANGES.jp %{cannadir}/RKCCONF.jp
-%doc %{cannadir}/README %{cannadir}/README.jp %{cannadir}/WHATIS
-%doc %{cannadir}/WHATIS.jp %{cannadir}/Canna.conf
+%lang(ja) %doc %{cannadir}/CHANGES.jp %{cannadir}/OCHANGES.jp
+%lang(ja) %doc %{cannadir}/README.jp %{cannadir}/RKCCONF.jp %{cannadir}/WHATIS.jp
+%doc %{cannadir}/ChangeLog %{cannadir}/README %{cannadir}/WHATIS
+%doc %{cannadir}/Canna.conf
 %doc $RPM_BUILD_DIR/%{name}-%{version}/sample
 %config %{_sysconfdir}/rc.d/init.d/canna
 %config %{_sysconfdir}/skel/.canna
@@ -296,7 +296,7 @@
 %{_bindir}/*
 %{_datadir}/canna
 %{_mandir}/man1/*
-%{_mandir}/ja/man1/*
+%lang(ja) %{_mandir}/ja/man1/*
 %defattr (0755,root,root)
 %{_sbindir}/cannaserver
 %{_sbindir}/cannakill
@@ -309,7 +309,7 @@
 %defattr (-,root,root)
 %{_includedir}/canna/
 %{_mandir}/man3/*
-%{_mandir}/ja/man3/*
+%lang(ja) %{_mandir}/ja/man3/*
 %{_libdir}/libRKC.a
 %{_libdir}/libRKC.so
 %{_libdir}/libRKC16.a
@@ -328,6 +328,9 @@
 %{_libdir}/libcanna16.so.*
 
 %changelog
+* Sat Aug 11 2007 Akira TAGOH <tagoh at redhat.com> - 3.7p3-19
+- Update an initscript with LSB standard (#246886)
+
 * Fri Aug 10 2007 Akira TAGOH <tagoh at redhat.com>
 - Update License tag.
 


Index: canna.init
===================================================================
RCS file: /cvs/pkgs/rpms/Canna/devel/canna.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- canna.init	26 Sep 2005 09:29:14 -0000	1.1
+++ canna.init	11 Aug 2007 05:29:50 -0000	1.2
@@ -11,6 +11,17 @@
 # Modifier 23 Jun 1999 Shoichiro Nagata <nagata at mach.ee.miyazaki-u.ac.jp>
 # Modifier 04 Feb 2003 Yukihiro Nakai <ynakai at redhat.com>
 
+### BEGIN INIT INFO
+# Provides: Canna
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Canna Japanese Conversion Engine
+# Description: Canna is a Japanese Conversion Engine can be used
+#              in order to convert Romaji/Kana to Kanji.
+### END INIT INFO
+
 # Source function library.
 . /etc/init.d/functions
  
@@ -20,7 +31,7 @@
 prog="Canna server"
 
 
-[ -f $SERVER ] || exit 0
+[ -x $SERVER ] || exit 5
  
 start() {
         rm -f /tmp/.iroha_unix/IROHA
@@ -34,12 +45,26 @@
 }
 
 stop() {
+	cannaping || exit 7
         action "Stopping $prog:" $KILLER 2> /dev/null
         rm -f /tmp/.iroha_unix/IROHA
 	rm -f /var/run/.iroha_unix/IROHA
         rm -f /var/lock/subsys/canna
 }
 
+restart() {
+	echo -n $"Restarting $prog: "
+	$KILLER 2> /dev/null
+        rm -f /tmp/.iroha_unix/IROHA
+	rm -f /var/run/.iroha_unix/IROHA
+        rm -f /var/lock/subsys/canna
+	$SERVER -syslog -u canna
+	cannaping && success || failure
+	RETVAL=$?
+	[ "$RETVAL" = 0 ] && touch /var/lock/subsys/canna
+	echo
+}
+
 case "$1" in
   start)
 	start
@@ -47,21 +72,23 @@
   stop)
 	stop
         ;;
-  status)
-        status cannaserver
-        ;;
-  restart|reload)
-        stop
-        start
-        ;;
-  condrestart)
+  restart|force-reload)
+	restart
+	;;
+  try-restart)
 	if [ -f /var/lock/subsys/canna ]; then
 	    stop
 	    start
 	fi
 	;;
+  reload)
+	exit 3
+	;;
+  status)
+        status cannaserver
+        ;;
   *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}"
         exit 1
 esac