[Erp5-report] r33994 luke - /erp5/trunk/utils/rpmgen/templates/

[nobody at svn.erp5.org]

Author: luke
Date: Tue Mar 23 11:22:04 2010
New Revision: 33994

URL: http://svn.erp5.org?rev=33994&view=rev
Log:
 - use macros to create/remove user (thanks Kazuhiko!)

Modified:
    erp5/trunk/utils/rpmgen/templates/tiolive-application-buildout-mandriva2010.spec.in

Modified: erp5/trunk/utils/rpmgen/templates/tiolive-application-buildout-mandriva2010.spec.in
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/templates/tiolive-application-buildout-mandriva2010.spec.in?rev=33994&r1=33993&r2=33994&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/templates/tiolive-application-buildout-mandriva2010.spec.in [utf8] (original)
+++ erp5/trunk/utils/rpmgen/templates/tiolive-application-buildout-mandriva2010.spec.in [utf8] Tue Mar 23 11:22:04 2010
@@ -29,10 +29,7 @@
 %{summary}
 
 %pre
-getent passwd %{erp5user} >/dev/null || \
-  useradd -r -d %{installdir} -s /sbin/nologin \
-      -c "ERP5 Official Buildout user" %{erp5user}
-exit 0
+%_pre_useradd %{erp5user} %{installdir} /bin/false
 
 %build
 cd %{installdir}
@@ -51,6 +48,10 @@
 bin/timmy-keygen -k server.key
 chown erp5 server.key
 
+%postun
+# XXX: Check that user directory is *NOT* deleted
+%_postun_userdel %{erp5user}
+
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}