rpms/Canna/devel Canna.spec,1.11,1.12

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	Canna.spec 
Log Message:
* Mon Aug 13 2007 Akira TAGOH <tagoh at redhat.com> - 3.7p3-20
- Follow UserCreation documentation to have canna user. (#223838)


Index: Canna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Canna/devel/Canna.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Canna.spec	11 Aug 2007 05:29:50 -0000	1.11
+++ Canna.spec	13 Aug 2007 12:28:26 -0000	1.12
@@ -2,11 +2,18 @@
 %define zipcodever 20030204
 %define cannadicver 0.95c
 %define cannadir Canna37p3
+### See http://fedoraproject.org/wiki/PackageUserCreation
+%bcond_without fedora
+%global uid           42
+%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: 19%{?dist}
+Release: 20%{?dist}
 # lib/RKindep/cksum.c is licensed under 4-clause BSD, otherwise MIT.
 License: MIT and BSD with advertising
 Group: System Environment/Libraries
@@ -41,13 +48,17 @@
 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): /bin/grep /etc/passwd %{_sbindir}/userdel %{_bindir}/id
+Requires(post): /bin/grep /etc/services /sbin/chkconfig %{__chown}
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
+Provides: user(%username) = %{uid}
+Provides: group(%username) = %{uid}
 BuildRequires: cpp gawk
 BuildRequires: imake >= 1.0.1-3
+BuildRequires: fedora-usermgmt-devel
 Obsoletes: tamago
+%{?FE_USERADD_REQ}
 
 %description
 Canna provides a user interface for inputting Japanese characters.
@@ -206,20 +217,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
@@ -243,19 +254,19 @@
 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
+[ -f /etc/passwd ] && if grep -q canna /etc/passwd; then
+	# old one might be there
+	[ "x`%{_bindir}/id -u canna`" = "x39" ] && %{_sbindir}/userdel canna &> /dev/null || :
 fi
-%{_sbindir}/useradd -c "Canna Service User" -r \
-    -s /sbin/nologin -u 39 -d %{_localstatedir}/lib/canna canna 2>/dev/null || :
+%{__fe_groupadd} %{uid} -r %{username} &> /dev/null || :
+%{__fe_useradd} %{uid} -r -s /sbin/nologin -d %{homedir} -M -c '%{gecos}' -g %{username} %{username} &>/dev/null || :
 
 %post
 if ! grep -q canna /etc/services
@@ -263,7 +274,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
@@ -275,6 +286,8 @@
 if [ "$1" -ge "1" ]; then
     /sbin/service canna try-restart >/dev/null 2>&1 || :
 fi
+%{__fe_userdel} %{username} &>/dev/null || :
+%{__fe_groupdel} %{username} &>/dev/null || :
 
 %post libs -p /sbin/ldconfig
 
@@ -300,10 +313,10 @@
 %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)
@@ -328,6 +341,9 @@
 %{_libdir}/libcanna16.so.*
 
 %changelog
+* 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)