[milter-greylist] drop upstart support

[Paul Howarth]

commit 7e8f8b12741bad219639ec35d42d282102b10c5b
Author: Paul Howarth <paul at city-fan.org>
Date:   Sat Mar 2 14:18:33 2013 +0000

    drop upstart support

 milter-greylist.spec    |   43 +++++--------------------------------------
 milter-greylist.upstart |   24 ------------------------
 2 files changed, 5 insertions(+), 62 deletions(-)
---
diff --git a/milter-greylist.spec b/milter-greylist.spec
index e7b3280..b52861c 100644
--- a/milter-greylist.spec
+++ b/milter-greylist.spec
@@ -5,7 +5,6 @@
 %bcond_without		fedora
 %bcond_without		noarch
 %bcond_with		sysv
-%bcond_with		upstart
 %bcond_without		systemd
 %bcond_with		spf
 %bcond_with		libbind
@@ -46,7 +45,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	4.4.2
-Release:	%release_func 1901
+Release:	%release_func 1902
 License:	BSD with advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -79,17 +78,6 @@ Requires(post):		%__chkconfig
 Requires(preun):	%__chkconfig
 %{?noarch}
 
-%package upstart
-Summary:		upstart initscripts for %name
-Group:			System Environment/Daemons
-Source10:		%name.upstart
-Provides:		init(%name) = upstart
-Requires:		%name = %version-%release
-Requires(pre):		/etc/init
-Requires(post):		/usr/bin/killall
-Requires(postun):	/sbin/initctl
-%{?noarch}
-
 %package systemd
 Summary:		Systemd initscripts for %name
 Group:			System Environment/Daemons
@@ -120,16 +108,6 @@ traffic and processor load on your mailserver.
 This package provides the SysV initscripts for the %name package.
 
 
-%description upstart
-Greylisting is a new method of blocking significant amounts of spam at
-the mailserver level, but without resorting to heavyweight statistical
-analysis or other heuristical (and error-prone) approaches. Consequently,
-implementations are fairly lightweight, and may even decrease network
-traffic and processor load on your mailserver.
-
-This package provides the upstart initscripts for the %name package.
-
-
 %description systemd
 Greylisting is a new method of blocking significant amounts of spam at
 the mailserver level, but without resorting to heavyweight statistical
@@ -192,7 +170,6 @@ rm -rf $RPM_BUILD_ROOT
 %__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
 
 install -D -p -m 0755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
-install -D -p -m 0644 %SOURCE10    $RPM_BUILD_ROOT%_sysconfdir/init/milter-greylist.conf
 install -D -p -m 0644 %SOURCE20    $RPM_BUILD_ROOT%_unitdir/%name.service
 
 cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/%name.conf
@@ -206,7 +183,6 @@ touch $RPM_BUILD_ROOT%_var/run/milter-greylist.pid
 ## Remove the unwanted init-methods
 %{!?with_sysv:     rm -rf $RPM_BUILD_ROOT%_initrddir}
 %{!?with_sysv:     rm -rf $RPM_BUILD_ROOT%_var/run/milter-greylist.pid}
-%{!?with_upstart:  rm -rf $RPM_BUILD_ROOT%_sysconfdir/init}
 %{!?with_systemd:  rm -rf $RPM_BUILD_ROOT%_unitdir}
 %{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d}
 
@@ -235,13 +211,6 @@ test "$1" != 0 || %_initrddir/%name stop >/dev/null || :
 test "$1"  = 0 || %_initrddir/%name condrestart >/dev/null || :
 
 
-%post upstart
-/usr/bin/killall -u %username milter-greylist 2>/dev/null || :
-
-%preun upstart
-test "$1" != "0" || /sbin/initctl -q stop milter-greylist || :
-
-
 %systemd_install systemd %name.service
 
 
@@ -276,11 +245,6 @@ rm -rf $RPM_BUILD_ROOT
   %ghost %_var/run/milter-greylist.pid
 %endif
 
-%if 0%{?with_upstart:1}
-%files upstart
-  %defattr(-,root,root,-)
-  %config(noreplace) %_sysconfdir/init/*
-%endif
 
 %if 0%{?with_systemd:1}
 %files systemd
@@ -290,8 +254,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 11 2013 Paul Howarth <paul at city-fan.org> - 4.4.2-1902
+- Drop upstart support
+
 * Wed Apr 10 2013 Jon Ciesla <limburgher at gmail.com> - 4.4.2-1901
-- Migrate from fedora-usermgmt to guideline scriptlets.
+- Migrate from fedora-usermgmt to guideline scriptlets
 
 * Sun Jan 27 2013 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.4.2-1900
 - updated to 4.4.2