- use %userremove/%groupremove, some cosmetics

[packages/bircd.git] / bircd.spec

diff --git a/bircd.spec b/bircd.spec
index efd4fcb0ba11e5ce434609a54f2a85164094f684..05937dbd12c787c3fcfdb4f466c64874d4672ceb 100644 (file)
--- a/bircd.spec
+++ b/bircd.spec
@@ -14,6 +14,7 @@ Patch0:               %{name}-makefile.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-fix.patch
 URL:           http://www.onthanet.nl/~borg/
+BuildRequires: rpmbuild(macros) >= 1.159
 PreReq:                rc-scripts
 Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
@@ -21,8 +22,10 @@ Requires(pre):       /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(post):        fileutils
 Requires(post,preun):  /sbin/chkconfig
-Requires(postun):      /usr/sbin/userdel
 Requires(postun):      /usr/sbin/groupdel
+Requires(postun):      /usr/sbin/userdel
+Provides:      group(ircd)
+Provides:      user(ircd)
 Obsoletes:     ircd
 Obsoletes:     ircd6
 Obsoletes:     ircd-hybrid
@@ -87,7 +90,7 @@ if [ -n "`getgid ircd`" ]; then
                exit 1
        fi
 else
-       %{_sbindir}/groupadd -f -g 75 ircd 2> /dev/null
+       /usr/sbin/groupadd -f -g 75 ircd 2> /dev/null
 fi
 if [ -n "`id -u ircd 2>/dev/null`" ]; then
        if [ "`id -u ircd`" != "75" ]; then
@@ -95,7 +98,7 @@ if [ -n "`id -u ircd 2>/dev/null`" ]; then
                exit 1
        fi
 else
-       %{_sbindir}/useradd -g ircd -d /etc/ircd -u 75 -s /bin/true -c "IRC Service account" ircd 2> /dev/null
+       /usr/sbin/useradd -g ircd -d /etc/ircd -u 75 -s /bin/true -c "IRC Service account" ircd 2> /dev/null
 fi
 
 %post
@@ -119,10 +122,9 @@ if [ "$1" = "0" ]; then
 fi
 
 %postun
-# If package is being erased for the last time.
 if [ "$1" = "0" ]; then
-       %{_sbindir}/userdel ircd 2> /dev/null
-       %{_sbindir}/groupdel ircd 2> /dev/null
+       %userremove ircd
+       %groupremove ircd
 fi
 
 %files