- use %useradd/%groupadd macros

Changed files:
    bnc.spec -> 1.34

diff --git a/bnc.spec b/bnc.spec
index 361bc1406fbd511a903d7f405e097b4fcbebe6b3..188ce1219c31fdca0c6b1456ab5c7e084c3423a5 100644 (file)
--- a/bnc.spec
+++ b/bnc.spec
@@ -18,7 +18,7 @@ URL:          http://www.gotbnc.com/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: openssl-devel
-BuildRequires: rpmbuild(macros) >= 1.177
+BuildRequires: rpmbuild(macros) >= 1.202
 Provides:      group(bnc)
 Provides:      user(bnc)
 Requires:      dialog >= 1:0.69
@@ -26,9 +26,6 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/%{name}
 
-%define                userid          142
-%define                groupid         142
-
 %description
 BNC is a great IRC (Internet Relay Chat) proxying server under the GPL
 (General Public License). It allows users to connect to chat servers
@@ -96,23 +93,8 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 rm -rf $RPM_BUILD_ROOT
 
 %pre init
-if [ -n "`/usr/bin/getgid %{name}`" ]; then
-       if [ "`/usr/bin/getgid %{name}`" != %{groupid} ]; then
-               echo "Error: group %{name} doesn't have gid=%{groupid}. Correct this before installing %{name}." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/groupadd -g %{groupid} %{name}
-fi
-if [ -n "`/bin/id -u %{name} 2>/dev/null`" ]; then
-       if [ "`/bin/id -u %{name}`" != %{userid} ]; then
-               echo "Error: user %{name} doesn't have uid=%{userid}. Correct this before installing %{name}." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/useradd -u %{userid} -d /var/run/%{name} -s /bin/false \
-               -c "%{name} User" -g %{name} %{name} 1>&2
-fi
+%groupadd -g 142 %{name}
+%useradd -u 142 -d /var/run/%{name} -s /bin/false -c "%{name} User" -g %{name} %{name}
 
 %post init
 if ! egrep -q '^(adminpass|password)' /etc/bnc/bnc.conf; then
@@ -143,8 +125,8 @@ fi
 
 %postun init
 if [ "$1" = "0" ]; then
-       %userremove bnc
-       %groupremove bnc
+       %userremove %{name}
+       %groupremove %{name}
 fi
 
 %files
@@ -155,8 +137,8 @@ fi
 %files init
 %defattr(644,root,root,755)
 %dir %attr(750,root,bnc) %{_sysconfdir}
-%config(noreplace) %verify(not size mtime md5) %attr(640,root,bnc) %{_sysconfdir}/*
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/%{name}
+%config(noreplace) %verify(not md5 mtime size) %attr(640,root,bnc) %{_sysconfdir}/*
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %dir %attr(770,root,bnc) /var/run/%{name}
 %attr(620,bnc,bnc) %ghost /var/log/%{name}.log