SPECS (AC-branch): Canna.spec - use %service,%useradd, adapterized

[glen]

Author: glen                         Date: Wed Apr 12 21:19:40 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use %service,%useradd, adapterized

---- Files affected:
SPECS:
   Canna.spec (1.13 -> 1.13.2.1) 

---- Diffs:

================================================================
Index: SPECS/Canna.spec
diff -u SPECS/Canna.spec:1.13 SPECS/Canna.spec:1.13.2.1
--- SPECS/Canna.spec:1.13	Sun Aug 22 15:10:34 2004
+++ SPECS/Canna.spec	Wed Apr 12 23:19:32 2006
@@ -8,7 +8,7 @@
 License:	BSD-like
 Group:		Libraries
 #origin, but host not found: ftp://ftp.nec.co.jp/pub/Canna/Canna35/Canna35b2.tar.gz
-Source0:	ftp://ftp.tokyonet.ad.jp/pub/misc/%{name}/%{name}35/%{name}35b2.tar.gz
+Source0:	ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/%{name}35b2.tar.gz
 # Source0-md5:	09ae4dd3a5d33168ba17470ad9242cf3
 Source1:	%{name}.init
 Source2:	%{name}-dot-canna
@@ -25,17 +25,19 @@
 Patch10:	%{name}-fixes.patch
 URL:		http://www.nec.co.jp/japanese/product/computer/soft/canna/
 BuildRequires:	imake
-PreReq:		rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun):	rc-scripts
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 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:	%{name}-libs = %{version}
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:	rc-scripts
 ExcludeArch:	ia64
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Canna is a Japanese input system and provides a unified user interface
@@ -161,23 +163,8 @@
 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
+%groupadd -g 41 -r -f canna
+%useradd -u 41 -r -d /var/lib/canna -s /bin/false -c "Canna Service User" -g canna canna
 
 %post
 /sbin/chkconfig --add canna
@@ -197,7 +184,8 @@
 
 %postun
 if [ "$1" = "0" ]; then
-	/usr/sbin/userdel canna
+	%userremove canna
+	%groupremove canna
 fi
 
 %post	libs -p /sbin/ldconfig
@@ -211,19 +199,19 @@
 %attr(755,root,root) %{_sbindir}/cannaserver
 %attr(755,root,root) %{_sbindir}/cannakill
 %attr(754,root,root) /etc/rc.d/init.d/canna
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/hosts.canna
-%config(noreplace) %verify(not size mtime md5) /etc/skel/.canna
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hosts.canna
+%config(noreplace) %verify(not md5 mtime size) /etc/skel/.canna
 %{_mandir}/man1/*
 %lang(ja) %{_mandir}/ja/man1/*
 %attr(770,root,canna) /var/log/canna
 %dir /var/lib/canna
-%config(noreplace) %verify(not size mtime md5) /var/lib/canna/default.canna
-%config(noreplace) %verify(not size mtime md5) /var/lib/canna/engine.cf
+%config(noreplace) %verify(not md5 mtime size) /var/lib/canna/default.canna
+%config(noreplace) %verify(not md5 mtime size) /var/lib/canna/engine.cf
 %attr(775,root,canna) %dir /var/lib/canna/dic
-%attr(664,root,canna) %config(noreplace) %verify(not size mtime md5) /var/lib/canna/dic/*.cbp
+%attr(664,root,canna) %config(noreplace) %verify(not md5 mtime size) /var/lib/canna/dic/*.cbp
 %attr(775,root,canna) %dir /var/lib/canna/dic/canna
-%attr(664,root,canna) %config(noreplace) %verify(not size mtime md5) /var/lib/canna/dic/canna/*.c*
-%config(noreplace) %verify(not size mtime md5) /var/lib/canna/dic/canna/dics.dir
+%attr(664,root,canna) %config(noreplace) %verify(not md5 mtime size) /var/lib/canna/dic/canna/*.c*
+%config(noreplace) %verify(not md5 mtime size) /var/lib/canna/dic/canna/dics.dir
 /var/lib/canna/sample
 
 %files libs
@@ -256,6 +244,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13.2.1  2006/04/12 21:19:32  glen
+- use %service,%useradd, adapterized
+
 Revision 1.13  2004/08/22 13:10:34  qboosh
 - added fixes patch, fixed build on amd64; release 44
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/Canna.spec?r1=1.13&r2=1.13.2.1&f=u