- use macros in %{pre,post}{,un}

- need rebuilt rpm (with new macros.pld) to build these

Changed files:
    pld-builder.spec -> 1.5

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