tiarra: set daemon user

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2343 ec354946-7b23-47d6-9f5a-488ba84defc7

t/tiarra/tiarra-vl.spec

@@ -5,19 +5,19 @@ Summary: Tiarra - IRC Proxy software
 Summary(ja): Tialla - IRC 用中継/クライアントプログラム
 Name: %{tiarra}
 Version: 20100212
-Release: 2%{?_dist_release}
+Release: 4%{?_dist_release}
 URL: http://www.clovery.jp/%{tiarra}/
 Source0: http://www.clovery.jp/tiarra/archive/2010/02/%{tiarra}-%{version}.tar.bz2
-Source1: %{tiarra}-vine-sample.conf
+Source1: %{tiarra}-vine.conf
 Source2: %{tiarra}-init.sh
-Source3: %{tiarra}-vine.conf
 Patch0: %{tiarra}-%{version}-vine.patch
 License: GPL+ or Artistic
-Group: Applications/System
+Group: Applications/Services
 Requires: perl >= 5.6.0
+Requires(pre): shadow-utils
 Requires(post): chkconfig
-Requires(preun): chkconfig, initscripts
-Requires(postun): initscripts
+Requires(preun): chkconfig
+Requires(postun): shadow-utils
 BuildArch: noarch
 Autoreq: no
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -43,31 +43,51 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}
 install -m 755 %{name} ${RPM_BUILD_ROOT}%{_bindir}/%{name}
 cp -af bundle main module  ${RPM_BUILD_ROOT}%{_datadir}/%{name}
 
-## for deamon
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
-install -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/%{name}
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}
-install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/%{name}-vine-sample.conf
+install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/%{name}-vine-sample.conf
+mkdir -p ${RPM_BUILD_ROOT}%{_initdir}
+install -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}%{_initdir}/%{name}
 mkdir -p ${RPM_BUILD_ROOT}%{tiarra_logdir}
 
 
 %clean
 [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 
+%pre
+if [ $1 -ge 1 ]; then
+  grep "%{name}:" /etc/group > /dev/null 2>&1
+  if [ $? == 1 ]; then
+    /usr/sbin/useradd -c "Tiarra IRC Proxy" -M -r -d / -s /sbin/nologin -U %{name}
+  fi
+  grep "%{name}:" /etc/passwd > /dev/null 2>&1
+  if [ $? == 1 ]; then
+    /usr/sbin/useradd -c "Tiarra IRC Proxy" -M -r -d / -s /sbin/nologin %{name}
+  fi
+  if [ -d %{tiarra_logdir} ]; then
+    ls -ld %{tiarra_logdir} | grep root
+    if [ $? = 0 ]; then
+      chown -R %{name}:%{name} %{tiarra_logdir}
+    fi
+  fi
+fi
+
 %post
 if [ $1 == 1 ]; then
   /sbin/chkconfig --add %{name}
+  #%{_initdir}/%{name} start
+else
+  %{_initdir}/%{name} condrestart
 fi
 
 %preun
 if [ $1 = 0 ]; then
-  /sbin/service %{name} stop >/dev/null 2>&1
+  %{_initdir}/%{name} stop
   /sbin/chkconfig --del %{name}
 fi
 
 %postun
-if [ "$1" -ge "1" ]; then
-  service %{name} condrestart
+if [ $1 = 0 ]; then
+  /usr/sbin/userdel %{name}
 fi
 
 
@@ -80,12 +100,17 @@ fi
 %{_datadir}/%{name}/*
 %dir %{_sysconfdir}/%{name}
 %{_sysconfdir}/%{name}/%{name}-vine-sample.conf
-%defattr(-, root, root)
-%{_sysconfdir}/rc.d/init.d/%{name}
-%dir %{tiarra_logdir}
+%{_initdir}/%{name}
+%attr(0750, %{name}, %{name}) %dir %{tiarra_logdir}
 
 
 %changelog
+* Mon Dec 13 2010 Shu KONNO <owa@bg.wakwak.com> 20100212-4
+- changed rpm-package group to Applications/Services
+- updated tiarra-init.sh (set daemon user to %{name})
+- added %pre section
+- vine-sample.conf files together into one
+
 * Thu Dec 09 2010 Shu KONNO <owa@bg.wakwak.com> 20100212-2
 - initial build for VineSeed
   - added tiarra-20100212-vine.patch (by Masahiro INOUE)