- use %useradd/%groupadd macros

Changed files:
    aspseek.spec -> 1.28

diff --git a/aspseek.spec b/aspseek.spec
index 255df1c69a5a180ed9ec9b25bd9ebee896eaefe2..fa995e11d76c39e639b7a5f0db0db5f2be96b4b4 100644 (file)
--- a/aspseek.spec
+++ b/aspseek.spec
@@ -19,7 +19,7 @@ BuildRequires:        apache(EAPI)-devel
 BuildRequires: libstdc++-devel
 BuildRequires: mysql-devel
 BuildRequires: openssl-devel >= 0.9.7d
-BuildRequires: rpmbuild(macros) >= 1.159
+BuildRequires: rpmbuild(macros) >= 1.202
 BuildRequires: zlib-devel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
@@ -141,14 +141,7 @@ touch $RPM_BUILD_ROOT/var/log/aspseek.log
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ -n "`/bin/id -u aspseek 2>/dev/null`" ]; then
-       if [ "`/bin/id -u aspseek`" != 50 ]; then
-               echo "Error: user aspseek doesn't have uid=50. Correct this before installing aspseek." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/useradd -u 50 -d /srv/aspseek -s /bin/false -c "ASPSEEK User" -g root aspseek 1>&2
-fi
+%useradd -u 50 -d /srv/aspseek -s /bin/false -c "ASPSEEK User" -g root aspseek
 
 %post
 /sbin/ldconfig