commit aa7c8a962214c0c4656d8740cda4554097c41c84 Author: Nathanael D. Noblet <nathanael@xxxxxxx> Date: Tue Oct 18 14:13:24 2011 -0600 fix for bug #745194 dspam-init.d | 93 ------------------------------------------------------- dspam-sysconfig | 3 -- dspam-systemd | 9 ++--- dspam.spec | 11 +++--- 4 files changed, 9 insertions(+), 107 deletions(-) --- diff --git a/dspam-systemd b/dspam-systemd index 66d14ea..fc739ea 100644 --- a/dspam-systemd +++ b/dspam-systemd @@ -1,11 +1,10 @@ [Unit] -Description=A highly accurate statistical spam filter minimal resources +Description=A highly accurate statistical spam filter that uses minimal resources [Service] -Type=Forking -EnvironmentFile=-/etc/sysconfig/dspam -User=${DSPAM_USER} -ExecStart=${DSPAM_BIN} --daemon 2>/dev/null +Type=forking +User=dspam +ExecStart=/usr/bin/dspam --daemon 2>/dev/null [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/dspam.spec b/dspam.spec index aed3204..3aa7f80 100644 --- a/dspam.spec +++ b/dspam.spec @@ -11,16 +11,14 @@ Summary: A library and Mail Delivery Agent for Bayesian SPAM filtering Name: dspam Version: 3.10.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: dspam-init.d Source2: dspam-cron Source3: dspam-logrotate Source4: dspam-web.conf Source5: dspam-front -Source6: dspam-sysconfig Source7: dspam-tmpfiles Source8: dspam-systemd Source99: dspam-filter-requires.sh @@ -224,9 +222,6 @@ echo "Scanned and tagged as non-SPAM with DSPAM %{version} by Your ISP.com"> $RP # install logrotate script %{__install} -Dp -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/dspam -# install sysconfig script -%{__install} -Dp -m0755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dspam - # install tmpfiles script %{__install} -Dp -m0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/dspam.conf @@ -378,6 +373,10 @@ exit 0 %config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf %changelog +* Tue Oct 18 2011 Nathanael Noblet <nathanael@xxxxxxx> - 3.10.1-2 +- Fix system bug #745194 +- remove init.d file + * Sun Sep 11 2011 Nathanael Noblet <nathanael@xxxxxxx> - 3.10.1-1 - New upstream release -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel