- registered uid/gid

- remove user/group in %postun

Changed files:
    bfilter.spec -> 1.13

diff --git a/bfilter.spec b/bfilter.spec
index 567c3848dfbc19872691d0cbc4e0ca6c7db09892..b65416b9c260379a137f5900a557002bfb91526f 100644 (file)
--- a/bfilter.spec
+++ b/bfilter.spec
@@ -13,7 +13,6 @@ Source0:      http://dl.sourceforge.net/bfilter/%{name}-%{version}.tar.gz
 # Source0-md5: 72ca85565bd4c556b06e3a264c0c24f1
 Source1:       %{name}.init
 URL:           http://bfilter.sf.net
-BuildRequires: broken-pre-scriptlet(fix:user/group)
 BuildRequires: libsigc++12-devel
 BuildRequires: libstdc++-devel
 BuildRequires: pkgconfig
@@ -60,14 +59,12 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-# XXX: unify
-# TODO register uid/gid in uid_gid.db.txt
-%groupadd -r -g XXX -f %{name}
-%useradd -r -u XXX -s /bin/false -d / -M -g %{name} -c "BFilter filtering proxy" %{name}
+%groupadd -r -g 199 %{name}
+%useradd -r -u 199 -s /bin/false -d / -g %{name} -c "BFilter filtering proxy" %{name}
 
 %post
 /sbin/chkconfig --add %{name}
-%service %{name} restart
+%service %{name} restart "BFilter filtering proxy"
 
 %preun
 if [ "$1" = "0" ]; then
@@ -75,6 +72,12 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del %{name}
 fi
 
+%postun
+if [ "$1" = "0" ]; then
+       %userremove %{name}
+       %groupremove %{name}
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README doc/*.html doc/*.png