rpms/kismet/devel kismet.spec,1.4,1.5

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19072/devel

Modified Files:
	kismet.spec 
Log Message:
use new fedora-usermgmt code



Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kismet.spec	29 Apr 2006 18:11:06 -0000	1.4
+++ kismet.spec	9 Jul 2006 14:53:07 -0000	1.5
@@ -2,6 +2,10 @@
 
 %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 @@
 # 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 @@
 
 
 %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 @@
 
 
 %changelog
+* Sun Jul  9 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2006.04.R1-3
+- use new fedora-usermgmt code
+
 * Sat Apr 29 2006 Enrico Scholz <enrico.scholz at 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)