- Req user-canna

Changed files:
    Canna.spec -> 1.7

diff --git a/Canna.spec b/Canna.spec
index aa323256c0aee6e6fa33b4127969dc16e17940c5..37842b33e3b5c0a317aef08771a66ebb878667c8 100644 (file)
--- a/Canna.spec
+++ b/Canna.spec
@@ -24,12 +24,7 @@ URL:         http://www.nec.co.jp/japanese/product/computer/soft/canna/
 BuildRequires: imake
 PreReq:                rc-scripts
 Requires(post,preun):  /sbin/chkconfig
-Requires(pre): /bin/id
-Requires(pre): /usr/bin/getgid
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /usr/sbin/groupdel
+Requires(pre): user-canna
 Requires:      %{name}-libs = %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 ExcludeArch:   ia64
@@ -151,25 +146,6 @@ EOF
 %clean
 rm -fr $RPM_BUILD_ROOT
 
-%pre
-if [ -n "`getgid canna`" ]; then
-       if [ "`getgid canna`" != "41" ]; then
-               echo "Warning: group canna doesn't have gid=41. Correct this before installing Canna." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/groupadd -g 41 -r -f canna
-fi
-if [ -n "`id -u canna 2>/dev/null`" ]; then
-       if [ "`id -u canna`" != "41" ]; then
-               echo "Warning: user canna doesn't have uid=41. Correct this before installing Canna." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/useradd -u 41 -r -d /var/lib/canna -s /bin/false \
-               -c "Canna Service User" -g canna canna 1>&2
-fi
-
 %post
 /sbin/chkconfig --add canna
 if [ -f /var/lock/subsys/canna ]; then
@@ -186,11 +162,6 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del canna
 fi
 
-%postun
-if [ "$1" = "0" ]; then
-       /usr/sbin/userdel canna
-fi
-
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig