- use %useradd/%groupadd macros

[packages/dcc-dccd.git] / dcc-dccd.spec

diff --git a/dcc-dccd.spec b/dcc-dccd.spec
index 01365876c7b8e19b70889942dbd718f6bfa0b162..bf34b58baaeb5d7ea0f07412f309d44edfb2f7cd 100644 (file)
--- a/dcc-dccd.spec
+++ b/dcc-dccd.spec
@@ -10,9 +10,11 @@ Source0:     http://www.dcc-servers.net/dcc/source/%{name}-%{version}.tar.Z
 URL:           http://www.dcc-servers.net/
 BuildRequires: fhs-compliance
 BuildRequires: using-special-registered-not-regular-user
+BuildRequires: rpmbuild(macros) >= 1.202
 Requires(pre): /usr/sbin/useradd
 Requires(postun):      /usr/sbin/userdel
 Requires(post,preun):  /sbin/chkconfig
+Provides:      user(dcc)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                dccdir  /var/lib/dcc
@@ -69,7 +71,7 @@ from sources in a "white list." White lists are generally the
 responsibility of DCC clients, since only they know which bulk mail
 they solicited.
 
-%description -l pl client
+%description client -l pl
 DCC (Distributed Checksum Clearinghouse) jest kooperatywnym,
 rozproszonym systemem maj±cym na celu wykrywanie masowej poczty lub
 poczty wys³anej do wielu ludzi. Pozwala jednostkom otrzymuj±cym
@@ -105,7 +107,7 @@ from sources in a "white list." White lists are generally the
 responsibility of DCC clients, since only they know which bulk mail
 they solicited.
 
-%description -l pl server
+%description server -l pl
 DCC (Distributed Checksum Clearinghouse) jest kooperatywnym,
 rozproszonym systemem maj±cym na celu wykrywanie masowej poczty lub
 poczty wys³anej do wielu ludzi. Pozwala jednostkom otrzymuj±cym
@@ -235,11 +237,12 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/updatedcc
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/useradd -d %{dccdir} -r dcc >/dev/null 2>&1
+# TODO register userid in uid_gid.db.txt
+%useradd -u XXX -d %{dccdir} -r dcc
 
 %postun
 if [ $1 = 0 ]; then
-       /usr/sbin/userdel -r dcc > /dev/null 2>&1 || :
+       %userremove dcc
 fi
 
 %post