- reverting last change: removing new macros from %p{re,ost}{,un}

Changed files:
    pld-builder.spec -> 1.6

diff --git a/pld-builder.spec b/pld-builder.spec
index 82bfbe2e93a3cb6369ddedad351d87b07b299322..a2c71f88fe22f306f7c056f5564582e0c7873db7 100644 (file)
--- a/pld-builder.spec
+++ b/pld-builder.spec
@@ -66,11 +66,16 @@ rm -f $RPM_BUILD_ROOT%{_builderdir}/bin/buildrpm-cron.bak
 install cron/builder $RPM_BUILD_ROOT/etc/cron.d/
 
 %pre
-USER=builder; GROUP=users; HOMEDIR="%{_builderdir} -m"; SHELL=/bin/bash
-%useradd
+if [ "$1" = "1" ]; then
+       if [ ! -n "`id -u builder 2>/dev/null`" ]; then
+               %{_sbindir}/useradd -g users -d %{_builderdir} -m -s /bin/bash builder 2> /dev/null
+       fi
+fi
 
 %postun
-USER=builder; %userdel
+if [ "$1" = "0" ]; then
+       %{_sbindir}/userdel builder 2> /dev/null
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT