From f490ad8ad0771dda31614f8c94e4795b9625e777 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sun, 1 May 2005 17:31:30 +0000
Subject: [PATCH] - use %useradd/%groupadd macros

Changed files:
    GNUnet.spec -> 1.18
---
 GNUnet.spec | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/GNUnet.spec b/GNUnet.spec
index 3fca1d3..99eb9e1 100644
--- a/GNUnet.spec
+++ b/GNUnet.spec
@@ -27,7 +27,7 @@ BuildRequires:	libltdl-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	mysql-devel >= 3.23.56
 BuildRequires:	openssl-devel >= 0.9.7d
-BuildRequires:	rpmbuild(macros) >= 1.159
+BuildRequires:	rpmbuild(macros) >= 1.202
 BuildRequires:	tdb-devel
 PreReq:		rc-scripts
 Requires(pre):	/bin/id
@@ -205,29 +205,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/{libgnunetutil,libgnunet_afs_esed2,libgnunetdht_
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ -n "`/usr/bin/getgid gnunet`" ]; then
-	if [ "`/usr/bin/getgid gnunet`" != 115 ]; then
-		echo "Error: group gnunet doesn't have gid=115. Correct this before installing GNUnet." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/groupadd -g 115 gnunet 1>&2
-fi
-if [ -n "`/bin/id -u gnunet 2>/dev/null`" ]; then
-	if [ "`/bin/id -u gnunet`" != 115 ]; then
-		echo "Error: user gnunet doesn't have uid=115. Correct this before installing GNUnet." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/useradd -o -u 115 -d /var/lib/GNUnet -s /bin/sh -g gnunet \
-		-c "GNUnet daemon" gnunet 1>&2
-fi
+%groupadd -g 115 gnunet
+%useradd -o -u 115 -d /var/lib/GNUnet -s /bin/sh -g gnunet -c "GNUnet daemon" gnunet
 
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add gnunet
 if [ -f /var/lock/subsys/gnunet ]; then
-	 /etc/rc.d/init.d/gnunet restart >&2
+	/etc/rc.d/init.d/gnunet restart >&2
 else
 	echo "Run \"/etc/rc.d/init.d/gnunet start\" to start GNUnet." >&2
 fi
-- 
2.44.0