rpms/milter-greylist/devel milter-greylist.spec,1.4,1.5

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9053/milter-greylist/devel

Modified Files:
	milter-greylist.spec 
Log Message:
- set %%dist
- use %%global instead of %%define
- do not require 'setuidgid' for -minit anymore



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- milter-greylist.spec	6 Apr 2005 22:12:41 -0000	1.4
+++ milter-greylist.spec	19 May 2005 17:37:44 -0000	1.5
@@ -1,25 +1,27 @@
+## $Id$
+
 ## This package accepts the following switches:
 ##   --with spf    ...  enable SPF support
 ##   --with minit  ...  enable minit support
 
 ## Fedora Extras specific customization below...
-%{!?release_func:%define release_func() %1}
 ##
 
 
-%define username	grmilter
-%define minitdir	%_sysconfdir/minit
-%define minitsvcdir	%minitdir/services/grmilter
-%define vardir		/var/lib/%name
-%define dbdir		%vardir/db
-%define rundir		%vardir/run
-%define __chkconfig	/sbin/chkconfig
+%global username	grmilter
+%global minitdir	%_sysconfdir/minit
+%global minitsvcdir	%minitdir/services/grmilter
+%global vardir		%_var/lib/%name
+%global dbdir		%vardir/db
+%global rundir		%vardir/run
+%global __chkconfig	/sbin/chkconfig
+
+%{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	1.6
-Release:	%release_func 2
-
+Release:	%release_func 3
 License:	BSD w/ advertising
 Group:		System Environment/Daemon
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -50,7 +52,6 @@
 Group:		System Environment/Daemon
 Provides:	init(%name) = minit
 Requires:		%name = %version-%release
-Requires:		%_sbindir/setuidgid
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
 
@@ -193,6 +194,11 @@
 %endif
 
 %changelog
+* Thu May 19 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.6-3
+- set %%dist
+- use %%global instead of %%define
+- do not require 'setuidgid' for -minit anymore
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt