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

[Enrico Scholz (ensc)]

Author: ensc

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

Modified Files:
	milter-greylist.spec 
Log Message:
- updated to 2.0rc5
- added patch which changes the way how the user will be switched in
  the SysV initscript
- removed all other patches as they are upstream now



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- milter-greylist.spec	19 May 2005 17:37:44 -0000	1.5
+++ milter-greylist.spec	25 Jun 2005 15:48:51 -0000	1.6
@@ -7,6 +7,7 @@
 ## Fedora Extras specific customization below...
 ##
 
+%global rcver		rc5
 
 %global username	grmilter
 %global minitdir	%_sysconfdir/minit
@@ -20,15 +21,13 @@
 
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
-Version:	1.6
-Release:	%release_func 3
+Version:	2.0
+Release:	%release_func 0.1.%rcver
 License:	BSD w/ advertising
 Group:		System Environment/Daemon
 URL:		http://hcpnet.free.fr/milter-greylist/
-Source0:	ftp://ftp.espci.fr/pub/milter-greylist/%name-%version.tgz
-Patch0:		milter-greylist-1.6-rh.patch
-Patch1:		milter-greylist-1.6-group.patch
-Patch2:		milter-greylist-1.4-spfbool.patch
+Source0:	ftp://ftp.espci.fr/pub/milter-greylist/%name-%version%rcver.tgz
+Patch0:		milter-greylist-2.0rc5-user.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:		init(%name)
 Requires(pre):		fedora-usermgmt
@@ -87,12 +86,9 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .rh
-%patch1 -p1 -b .group
-%patch2 -p1 -b .spfbool
+%setup -q -n %name-%version%rcver
+%patch0 -p1 -b .user
 
-perl -pi -e 's!(\$\{INSTALL\}.*\s)(\S+\s*)$!$1\${DESTDIR}$2!' Makefile.in
 perl -pi -e 's!--rpath!--XXXX!g' configure
 
 for i in `find -type f`; do
@@ -116,9 +112,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%__install -d -m755 \
-	$RPM_BUILD_ROOT{/etc/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_var/run}
 
+%__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%minitsvcdir,%rundir,%dbdir,%_var/run}
 %__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
 %__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
 
@@ -194,6 +189,12 @@
 %endif
 
 %changelog
+* Sat Jun 25 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0-0.1.rc5
+- updated to 2.0rc5
+- added patch which changes the way how the user will be switched in
+  the SysV initscript
+- removed all other patches as they are upstream now
+
 * Thu May 19 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.6-3
 - set %%dist
 - use %%global instead of %%define