rpms/Canna/FC-6 Canna.spec,1.9,1.10 canna.init,1.1,1.2
Akira Tagoh (tagoh)
fedora-extras-commits at redhat.com
Mon Aug 20 07:15:39 UTC 2007
Author: tagoh
Update of /cvs/pkgs/rpms/Canna/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16495
Modified Files:
Canna.spec canna.init
Log Message:
* Tue Aug 14 2007 Akira TAGOH <tagoh at redhat.com> - 3.7p3-21
- Update the user and the group handling.
Index: Canna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Canna/FC-6/Canna.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Canna.spec 27 Mar 2007 12:47:57 -0000 1.9
+++ Canna.spec 20 Aug 2007 07:15:07 -0000 1.10
@@ -2,12 +2,17 @@
%define zipcodever 20030204
%define cannadicver 0.95c
%define cannadir Canna37p3
+%global username canna
+%global homedir %{_var}/lib/%{username}
+%global gecos Canna Service User
+
Summary: A Japanese character set input system.
Name: Canna
Version: 3.7p3
-Release: 18%{?dist}
-License: Distributable
+Release: 21%{?dist}
+# lib/RKindep/cksum.c is licensed under 4-clause BSD, otherwise MIT.
+License: MIT and BSD with advertising
Group: System Environment/Libraries
URL: http://www.nec.co.jp/japanese/product/computer/soft/canna/
Source0: http://prdownloads.sourceforge.jp/canna/7240/%{cannadir}.tar.bz2
@@ -40,8 +45,8 @@
Patch43: Canna-3.7p3-fix-gcc4-warning.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(pre): /bin/grep %{_sbindir}/userdel %{_sbindir}/useradd /etc/passwd
-Requires(post): /bin/grep /etc/services /sbin/chkconfig /bin/chown
+Requires(pre): shadow-utils
+Requires(post): /bin/grep /etc/services /sbin/chkconfig %{__chown}
Requires(preun): /sbin/service /sbin/chkconfig
Requires(postun): /sbin/service
BuildRequires: cpp gawk
@@ -205,20 +210,20 @@
cd ..
cd cannadic-%{cannadicver}
-%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna
+%{__mkdir_p} $RPM_BUILD_ROOT%{_var}/lib/canna/dic/canna
%{__install} -m 644 gcanna*.c[bl]d \
- $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna
+ $RPM_BUILD_ROOT%{_var}/lib/canna/dic/canna
cd ..
cd pubdic-bonobo
%{__install} -m 644 bonobo*.c[bl]d \
- $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna
+ $RPM_BUILD_ROOT%{_var}/lib/canna/dic/canna
cd ..
cd shion
%{__install} -m 644 basho.cld basho.cbd kaom.ctd keisan.cld keisan.cbd \
pub.cld pub.cbd scien.cld scien.cbd sup.cld sup.cbd \
- $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna
+ $RPM_BUILD_ROOT%{_var}/lib/canna/dic/canna
cd ..
%{__mkdir_p} $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -242,19 +247,16 @@
ln -sf ../bin/catdic $RPM_BUILD_ROOT%{_sbindir}/cannakill
mv $RPM_BUILD_ROOT%{_sysconfdir}/canna/sample $RPM_BUILD_DIR/%{name}-%{version}
-%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/run/.iroha_unix
+%{__mkdir_p} $RPM_BUILD_ROOT%{_var}/run/.iroha_unix
%clean
rm -fr $RPM_BUILD_ROOT
%pre
-if %{__grep} -q '^canna:' /etc/passwd
-then
-%{_sbindir}/userdel canna
-fi
-%{_sbindir}/useradd -c "Canna Service User" -r \
- -s /sbin/nologin -u 39 -d %{_localstatedir}/lib/canna canna 2>/dev/null || :
+getent group %{username} >/dev/null || groupadd -r %{username}
+getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} -s /sbin/nologin -c '%{gecos}' %{username}
+exit 0
%post
if ! grep -q canna /etc/services
@@ -262,7 +264,7 @@
echo "canna 5680/tcp" >>/etc/services
fi
/sbin/chkconfig --add canna
-chown -R canna:canna /var/lib/canna
+%{__chown} -R %{username}:%{username} %{_var}/lib/canna
%preun
if [ "$1" = "0" ]; then
@@ -272,7 +274,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
@@ -281,10 +283,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
@@ -295,20 +297,20 @@
%{_bindir}/*
%{_datadir}/canna
%{_mandir}/man1/*
-%{_mandir}/ja/man1/*
+%lang(ja) %{_mandir}/ja/man1/*
%defattr (0755,root,root)
%{_sbindir}/cannaserver
%{_sbindir}/cannakill
-%defattr (-,canna,canna)
-%dir %{_localstatedir}/run/.iroha_unix
-%{_localstatedir}/lib/canna
-%{_localstatedir}/log/canna
+%defattr (-,%{username},%{username})
+%dir %{_var}/run/.iroha_unix
+%{_var}/lib/canna
+%{_var}/log/canna
%files devel
%defattr (-,root,root)
%{_includedir}/canna/
%{_mandir}/man3/*
-%{_mandir}/ja/man3/*
+%lang(ja) %{_mandir}/ja/man3/*
%{_libdir}/libRKC.a
%{_libdir}/libRKC.so
%{_libdir}/libRKC16.a
@@ -327,6 +329,18 @@
%{_libdir}/libcanna16.so.*
%changelog
+* Tue Aug 14 2007 Akira TAGOH <tagoh at redhat.com> - 3.7p3-21
+- Update the user and the group handling.
+
+* Mon Aug 13 2007 Akira TAGOH <tagoh at redhat.com> - 3.7p3-20
+- Follow UserCreation documentation to have canna user. (#223838)
+
+* 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.
+
* Tue Mar 27 2007 Akira TAGOH <tagoh at redhat.com> - 3.7p3-18
- Fix missing directory owner. (#233779)
Index: canna.init
===================================================================
RCS file: /cvs/pkgs/rpms/Canna/FC-6/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 20 Aug 2007 07:15:07 -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
More information about the fedora-extras-commits
mailing list