From 77c40ea6c595a37b7fc86e3d76b152f395172cac Mon Sep 17 00:00:00 2001
From: ensc <ensc@fedoraproject.org>
Date: Jul 09 2006 14:53:07 +0000
Subject: use new fedora-usermgmt code


---

diff --git a/kismet.spec b/kismet.spec
index ec01c86..189a6f4 100644
--- a/kismet.spec
+++ b/kismet.spec
@@ -1,7 +1,11 @@
-## $Id: kismet.spec,v 1.4 2006/04/29 18:11:06 ensc Exp $
+## $Id: kismet.spec,v 1.5 2006/07/09 14:53:07 ensc Exp $
 
 %global _version	2006-04-R1
 
+## Fedora Extras specific customization below...
+%bcond_without       	fedora
+##
+
 ## {Local macros...
 %global username	kismet
 %global crontabdir	%_sysconfdir/cron.daily
@@ -16,7 +20,7 @@
 Summary:	WLAN detector, sniffer and IDS
 Name:		kismet
 Version:	%_rpmversion
-Release:	%release_func 2
+Release:	%release_func 3
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.kismetwireless.net/
@@ -39,12 +43,14 @@ BuildRequires:		ImageMagick-devel
 # should be required by ImageMagick-devel but are missing in FC4
 BuildRequires:		libtiff-devel libjpeg-devel freetype-devel
 BuildRequires:		bzip2-devel
-Requires(pre):		fedora-usermgmt
-Requires(postun):	fedora-usermgmt
+BuildRequires:		fedora-usermgmt-devel
+Provides:		user(%username)
+Provides:		group(%username)
 Requires(missingok):	tmpwatch
 Requires(missingok):	crontabs
 Requires(pre):		%crontabdir
 Requires(postun):	%crontabdir
+%{?FE_USERADD_REQ}
 
 
 %package extras
@@ -122,14 +128,14 @@ install -p -m644 %SOURCE11       $RPM_BUILD_ROOT%_sysconfdir/sysconfig/kismet
 
 
 %pre
-/usr/sbin/fedora-groupadd 12 -r %username &>/dev/null || :
-/usr/sbin/fedora-useradd  12 -r -s /sbin/nologin -M -d %homedir		\
-			     -c 'Kismet user' -g %username %username &>/dev/null || :
+%__fe_groupadd 12 -r %username &>/dev/null || :
+%__fe_useradd  12 -r -s /sbin/nologin -M -d %homedir		\
+	          -c 'Kismet user' -g %username %username &>/dev/null || :
 
 
 %postun
-test "$1" != 0 || /usr/sbin/fedora-userdel  %username &>/dev/null || :
-test "$1" != 0 || /usr/sbin/fedora-groupdel %username &>/dev/null || :
+%__fe_userdel  %username &>/dev/null || :
+%__fe_groupdel %username &>/dev/null || :
 
 
 %clean
@@ -158,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul  9 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.0.2006.04.R1-3
+- use new fedora-usermgmt code
+
 * Sat Apr 29 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.0.2006.04.R1-2
 - fixed compilation problems on AMD64 introduced by my -alias patch
   (reported by Hans de Goede)