Hello community, here is the log from the commit of package spamassassin for openSUSE:12.2 checked in at 2012-06-26 20:04:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/spamassassin (Old) and /work/SRC/openSUSE:12.2/.spamassassin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spamassassin", Maintainer is "varkoly@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/spamassassin/spamassassin.changes 2012-06-25 15:53:22.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.spamassassin.new/spamassassin.changes 2012-06-26 20:04:06.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 26 08:54:29 UTC 2012 - varkoly@suse.com + +- Add systemd service files for spamd and spampd + bnc#768581 - rcspamd stop doesn't terminate spamd + +------------------------------------------------------------------- New: ---- spamd.service spampd.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.Rc7vSQ/_old 2012-06-26 20:04:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Rc7vSQ/_new 2012-06-26 20:04:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define ix_version 1.5.5 %define spd_version 2.20 @@ -25,12 +24,11 @@ Name: spamassassin Summary: Extensible email filter which is used to identify spam -Version: 3.3.2 -Release: 10 -%define sa_version 3.3.2 License: Apache-2.0 Group: Productivity/Networking/Email/Utilities -AutoReqProv: on +Version: 3.3.2 +Release: 0 +%define sa_version 3.3.2 Url: http://spamassassin.org/ Source: http://search.cpan.org/CPAN/authors/id/K/KM/KMCGRAIL/Mail-SpamAssassin-%{version}.tar.gz Source1: Mail-SpamAssassin-rules-%{version}.tar.bz2 @@ -42,6 +40,8 @@ Source13: init.spampd Source14: sysconfig.spampd Source15: suse.cron-sa-update +Source16: spamd.service +Source17: spampd.service Patch0: patch-utf8 Patch1: patch-PgSQL Patch2: patch-URIDNSBL @@ -53,11 +53,15 @@ BuildRequires: dos2unix BuildRequires: openssl-devel # +Requires: perl-IO-Socket-INET6 +Requires: perl-Mail-DKIM Requires: perl-Mail-SpamAssassin = %version Requires: re2c Requires: perl(Net::Server::PreForkSimple) -Requires: perl-IO-Socket-INET6 -Requires: perl-Mail-DKIM +%if 0%{?suse_version} > 1140 +BuildRequires: systemd +%{?systemd_requires} +%endif %description spamassassin adds a header line that shows if the mail has been @@ -71,16 +75,15 @@ %package -n perl-Mail-SpamAssassin Summary: Perl Modules For Using Spamassassin Within An Own Perl Script -License: Apache-2.0 Group: Development/Libraries/Perl BuildRequires: perl BuildRequires: perl-macros +BuildRequires: perl(Archive::Tar) >= 1.23 BuildRequires: perl(Digest::SHA1) BuildRequires: perl(Errno) -BuildRequires: perl(File::Spec) >= 0.8 BuildRequires: perl(File::Copy) >= 2.02 +BuildRequires: perl(File::Spec) >= 0.8 BuildRequires: perl(HTML::Parser) >= 3.43 -BuildRequires: perl(Archive::Tar) >= 1.23 BuildRequires: perl(IO::Zlib) >= 1.04 BuildRequires: perl(Mail::DKIM) >= 0.37 BuildRequires: perl(Net::DNS) >= 0.34 @@ -93,21 +96,21 @@ %if 0%{?suse_version} >= 1100 BuildRequires: perl(Mail::SPF) %endif -BuildRequires: perl(IP::Country) -BuildRequires: perl(Razor2::Client::Agent) >= 2.61 -BuildRequires: perl(Net::Ident) -BuildRequires: perl(IO::Socket::INET6) -BuildRequires: perl(IO::Socket::SSL) BuildRequires: perl(DBI) BuildRequires: perl(Encode::Detect) +BuildRequires: perl(IO::Socket::INET6) +BuildRequires: perl(IO::Socket::SSL) +BuildRequires: perl(IP::Country) +BuildRequires: perl(Net::Ident) +BuildRequires: perl(Razor2::Client::Agent) >= 2.61 # Requires: perl-libwww-perl +Requires: perl(Archive::Tar) >= 1.23 Requires: perl(Digest::SHA1) Requires: perl(Errno) -Requires: perl(File::Spec) >= 0.8 Requires: perl(File::Copy) >= 2.02 +Requires: perl(File::Spec) >= 0.8 Requires: perl(HTML::Parser) >= 3.43 -Requires: perl(Archive::Tar) >= 1.23 Requires: perl(IO::Zlib) >= 1.04 Requires: perl(Mail::DKIM) >= 0.37 Requires: perl(Net::DNS) >= 0.34 @@ -137,11 +140,10 @@ %package -n perl-Mail-SpamAssassin-Plugin-iXhash Summary: The iXhash plugin for SpamAssassin -License: Apache-2.0 Group: Development/Libraries/Perl Requires: perl-Mail-SpamAssassin = %version Version: %{ix_version} -Release: 10 +Release: 0 %{perl_requires} %description -n perl-Mail-SpamAssassin-Plugin-iXhash @@ -221,16 +223,42 @@ %{__install} -d $RPM_BUILD_ROOT/usr/share/spamassassin pushd $RPM_BUILD_ROOT/usr/share/spamassassin && tar -xjf %{S:1} && popd +%if 0%{?suse_version} > 1140 +## systemd stuff +mkdir -p $RPM_BUILD_ROOT/lib/systemd/system +%{__install} -m 644 %{S:16} $RPM_BUILD_ROOT/lib/systemd/system/ +%{__install} -m 644 %{S:17} $RPM_BUILD_ROOT/lib/systemd/system/ +%endif + %post %{fillup_and_insserv -n spamd} %{fillup_and_insserv -n spampd} +%if %suse_version > 1140 +%service_add_post spamd.service +%service_add_post spampd.service +%endif + +%pre +%if %suse_version > 1140 +%service_add_pre spamd.service +%service_add_pre spampd.service +%endif %preun %stop_on_removal spamd +%if %suse_version > 1140 +%service_del_preun spamd.service +%service_del_preun spampd.service +%endif %postun %restart_on_update spamd %insserv_cleanup +%if %suse_version > 1140 +%service_del_postun spamd.service +%service_del_postun spampd.service +%endif + exit 0 %clean @@ -246,6 +274,10 @@ %config %attr(744,root,root) /etc/init.d/spampd /var/adm/fillup-templates/sysconfig.spamd /var/adm/fillup-templates/sysconfig.spampd +%if 0%{?suse_version} > 1140 +%config /lib/systemd/system/spamd.service +%config /lib/systemd/system/spampd.service +%endif %files -n perl-Mail-SpamAssassin -f %{name}.files %defattr(-,root,root) ++++++ spamd.service ++++++ # This file is part of package amavisd. # # Copyright (c) 2011 SuSE LINUX Products GmbH, Germany. # Author: Werner Fink # Please send feedback to http://www.suse.de/feedback # # Description: # # Used to start the spamd the daemonized version of spamassassin # spamassassin adds a header line that shows if the mail has been # determined spam or not. This way, you can decide what to do with the # mail within the scope of your own filtering rules in your MUA (Mail # User Agent, your mail program) or your LDA (Local Delivery Agent). # [Unit] Description=Daemonized version of spamassassin Requires=remote-fs.target syslog.target After=remote-fs.target syslog.target Before=mail-transfer-agent.target Conflicts= [Service] Type=forking PIDFile=/var/run/spamd.pid ExecStartPre=-/bin/echo 'Starting spamd:' EnvironmentFile=-/etc/sysconfig/spamd ExecStart=/usr/sbin/spamd $SPAMD_ARGS -r /var/run/spamd.pid [Install] WantedBy=multi-user.target ++++++ spampd.service ++++++ # This file is part of package amavisd. # # Copyright (c) 2011 SuSE LINUX Products GmbH, Germany. # Author: Werner Fink # Please send feedback to http://www.suse.de/feedback # # Description: # # Used to start the spampd the SpamAssassin Proxy Daemon # spamassassin adds a header line that shows if the mail has been # determined spam or not. This way, you can decide what to do with the # mail within the scope of your own filtering rules in your MUA (Mail # User Agent, your mail program) or your LDA (Local Delivery Agent). # [Unit] Description=SpamAssassin Proxy Daemon Requires=remote-fs.target syslog.target After=remote-fs.target syslog.target Before=mail-transfer-agent.target Conflicts= [Service] Type=forking PIDFile=/var/run/spampd.pid ExecStartPre=-/bin/echo 'Starting the SpamAssassin Proxy Daemon:' EnvironmentFile=-/etc/sysconfig/spampd ExecStart=/usr/sbin/spampd $SPAMPD_OPTIONS [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org