rpms/milter-greylist/FC-3 milter-greylist.spec,1.1,1.2

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9088/milter-greylist/FC-3

Modified Files:
	milter-greylist.spec 
Log Message:
synced with devel/



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/FC-3/milter-greylist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- milter-greylist.spec	3 Feb 2005 10:13:34 -0000	1.1
+++ milter-greylist.spec	19 May 2005 17:39:07 -0000	1.2
@@ -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:	A milter for greylisting, the Next Step in the Spam Control War 
+Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	1.6
-Release:	%release_func 1
-Epoch:		0
+Release:	%release_func 3
 License:	BSD w/ advertising
 Group:		System Environment/Daemon
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -35,22 +37,21 @@
 BuildRequires:		sendmail-devel %{?_with_spf:libspf-devel}
 
 %package sysv
-Summary:	The sysv-initscripts for %name
+Summary:	Sysv initscripts for %name
 Group:		System Environment/Daemon
 Provides:	init(%name) = sysv
-Requires(preun):	%name = %epoch:%version-%release
-Requires(postun):	%name = %epoch:%version-%release
+Requires(preun):	%name = %version-%release
+Requires(postun):	%name = %version-%release
 Requires(preun):	initscripts
 Requires(postun):	initscripts
 Requires(post):		%__chkconfig
 Requires(preun):	%__chkconfig
 
 %package minit
-Summary:	The minit-initscripts for %name
+Summary:	Minit initscripts for %name
 Group:		System Environment/Daemon
 Provides:	init(%name) = minit
-Requires:		%name = %epoch:%version-%release
-Requires:		%_sbindir/setuidgid
+Requires:		%name = %version-%release
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
 
@@ -97,7 +98,7 @@
 for i in `find -type f`; do
     sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
             s!/var/milter-greylist/greylist.db!%dbdir/greylist.db!g;
-	   ' "$i" >"$i.tmp"
+           ' "$i" >"$i.tmp"
     cmp -s "$i" "$i.tmp" || cat "$i.tmp" >"$i"
     rm -f "$i".tmp
 done
@@ -145,7 +146,7 @@
                             -c 'Greylist-milter user' -g %username %username &>/dev/null || :
 
 
-%postun 
+%postun
 test "$1" != 0 || /usr/sbin/fedora-userdel  %username &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %username &>/dev/null || :
 
@@ -193,6 +194,14 @@
 %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
+
 * Thu Feb  3 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.6
 - updated to 1.6