rpms/milter-greylist/devel milter-greylist.upstart, 1.2, 1.3 milter-greylist.spec, 1.36, 1.37

[ensc]

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13468

Modified Files:
	milter-greylist.upstart milter-greylist.spec 
Log Message:
updated -upstart to upstart 0.6.3



Index: milter-greylist.upstart
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.upstart,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- milter-greylist.upstart	19 Aug 2009 19:52:04 -0000	1.2
+++ milter-greylist.upstart	6 Dec 2009 10:50:23 -0000	1.3
@@ -1,7 +1,7 @@
-### Uncomment matching 'start' lines below.
+### Uncomment (only) *one* matching 'start' line below
 
-### Uncomment these two lines when you want milter-greylist to be a
-### milter for a remote machine.
+### Uncomment this line when you want milter-greylist to be a milter
+### for a remote machine.
 
 #start on starting local
 
@@ -18,9 +18,9 @@
 #start on starting postfix
 
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on (runlevel 0 or
+          runlevel 1 or
+          runlevel 6)
 
 respawn
 exec /usr/sbin/milter-greylist -D


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- milter-greylist.spec	19 Aug 2009 20:53:46 -0000	1.36
+++ milter-greylist.spec	6 Dec 2009 10:50:23 -0000	1.37
@@ -20,7 +20,7 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	4.2.3
-Release:	%release_func 2%{?beta}
+Release:	%release_func 1300%{?beta}
 License:	BSD with advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -58,8 +58,7 @@ Group:			System Environment/Daemons
 Source10:		%name.upstart
 Provides:		init(%name) = upstart
 Requires:		%name = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 %{?noarch}
@@ -143,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 %__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%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
-%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/event.d/milter-greylist
+%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/init/milter-greylist.conf
 
 # create temporary files
 touch $RPM_BUILD_ROOT%rundir/milter-greylist.sock
@@ -209,10 +208,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files upstart
 %defattr(-,root,root,-)
-%config(noreplace) /etc/event.d/*
+%config(noreplace) /etc/init/*
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-1300
+- updated -upstart to upstart 0.6.3
+
 * Wed Aug 19 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-2
 - moved pre-2007 %%changelog entries into ChangeLog.rpm
 - do not link against libbind anymore; recent glibc seems to have