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

[nobody at svn.erp5.org]

Author: luke
Date: Fri Mar 19 10:12:26 2010
New Revision: 33904

URL: http://svn.erp5.org?rev=33904&view=rev
Log:
 - use instancehome instead of userhome
 - cleanup file a bit

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

Modified: erp5/trunk/utils/rpmgen/templates/erp5-official-buildout-mandriva2010.spec.in
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/templates/erp5-official-buildout-mandriva2010.spec.in?rev=33904&r1=33903&r2=33904&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/templates/erp5-official-buildout-mandriva2010.spec.in [utf8] (original)
+++ erp5/trunk/utils/rpmgen/templates/erp5-official-buildout-mandriva2010.spec.in [utf8] Fri Mar 19 10:12:26 2010
@@ -1,17 +1,13 @@
-
 %define version ${:version}
 %define name ${:name}
 %define release ${:release}
-# XXX: userhome might be controlled by caller or buildout
-%define userhome /var/lib/erp5
+# XXX: instancehome might be controlled by caller or buildout
+%define instancehome /var/lib/erp5
 %define erp5user erp5
-
 # We do not actually use /usr/local/bin/python
 %define _requires_exceptions /usr/local/bin/python
-
 %define fullname %{name}-%{version}
 %define installdir /opt/erp5/%{version}
-
 %define __find_provides ${:find_provides}
 
 Name: %{name}
@@ -33,9 +29,9 @@
 
 %pre
 getent passwd %{erp5user} >/dev/null || \
-  useradd -r -d %{userhome} -s /sbin/nologin \
+  useradd -r -d %{instancehome} -s /sbin/nologin \
       -c "ERP5 Official Buildout user" %{erp5user}
-/bin/chown -R %{erp5user} %{userhome}
+/bin/chown -R %{erp5user} %{instancehome}
 exit 0
 
 %build
@@ -59,4 +55,3 @@
 
 %clean
 %{__rm} -rf %{buildroot} %{installdir}
-