- make spamassassin the main package

- release 4, STBR

Changed files:
    spamassassin.spec -> 1.5

diff --git a/spamassassin.spec b/spamassassin.spec
index fd274a3d4af29cddde90befd44dfa8fbeb4d5f33..c6272a18f212261d970d57528a497dead781a0f1 100644 (file)
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -1,49 +1,26 @@
 %include       /usr/lib/rpm/macros.perl
 %define        pdir    Mail
 %define        pnam    SpamAssassin
-Summary:       %{pdir}::%{pnam} -- SpamAssassin e-mail filter Perl modules
-Summary(pl):   %{pdir}::%{pnam} -- modu³y Perla filtru poczty SpamAssassin
-Name:          perl-%{pdir}-%{pnam}
+Summary:       A spam filter for email which can be invoked from mail delivery agents
+Summary(pl):   Filtr antyspamowy, przeznaczony dla programów dostarczaj±cych pocztê (MDA)
+Group:         Applications/Mail
 Version:       2.31
-Release:       3
+Release:       4
+Name:          spamassassin
 License:       GPL/Artistic
-Group:         Development/Languages/Perl
 Source0:       http://spamassassin.org/released/%{pdir}-%{pnam}-%{version}.tar.gz
-#Patch0:               findbin.patch
 Patch0:                spamassassin-makefile.patch
 Patch1:                spamassassin-rc-script.patch
 URL:           http://spamassassin.org/
 BuildRequires: perl >= 5.6
 BuildRequires: rpm-perlprov >= 3.0.3-16
+Prereq:                /sbin/chkconfig
+Obsoletes:     SpamAssassin
 Buildroot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautoreq      'perl(Razor::Agent)' 'perl(Razor::Client)' 'perl(Net::SMTP::Server)' 'perl(Net::SMTP::Client)'
 
 %description
-Mail::SpamAssassin is a Mail::Audit plugin to identify spam using text
-analysis and several internet-based realtime blacklists. Using its
-rule base, it uses a wide range of heuristic tests on mail headers and
-body text to identify ``spam'', also known as unsolicited commercial
-email. Once identified, the mail can then be optionally tagged as spam
-for later filtering using the user's own mail user-agent application.
-
-%description -l pl
-Mail::SpamAssassin jest pluginem dla Mail::Audit, s³u¿±cym do
-identyfikacji spamu przy u¿yciu analizy zawarto¶ci i/lub internetowych
-czarnych list. Do zidentyfikowania jako ,,spam'' stosuje szeroki
-zakres testów heurystycznych na nag³ówkach i tre¶ci, posi³kuj±c siê
-stworzon± wcze¶niej baz± regu³. Po zidentyfikowaniu, poczta mo¿e byæ
-oznaczona jako spam w celu pó¼niejszego wyfiltrowania, np. przy u¿yciu
-aplikacji do czytania poczty.
-
-%package -n spamassassin
-Summary:       A spam filter for email which can be invoked from mail delivery agents
-Summary(pl):   Filtr antyspamowy, przeznaczony dla programów dostarczaj±cych pocztê (MDA)
-Group:         Applications/Mail
-Obsoletes:     SpamAssassin
-Prereq:                /sbin/chkconfig
-
-%description -n spamassassin
 SpamAssassin provides you with a way to reduce if not completely
 eliminate Unsolicited Commercial Email (SPAM) from your incoming
 email. It can be invoked by a MDA such as sendmail or postfix, or can
@@ -54,7 +31,7 @@ by the user's mail reading software. This distribution includes the
 spamd/spamc components which create a server that considerably speeds
 processing of mail.
 
-%description -n spamassassin -l pl
+%description -l pl
 SpamAssassin udostêpnia Ci mo¿liwo¶æ zredukowania, je¶li nie
 kompletnego wyeliminowania Niezamawianej Komercyjnej Poczty
 (Unsolicited Commercial Email, spamu) z Twojej poczty. Mo¿e byæ
@@ -66,23 +43,46 @@ Ta dystrybucja zawiera programy spamd/spamc, umo
 uruchomienie serwera, co znacznie przyspieszy proces przetwarzania
 poczty.
 
-%package -n spamassassin-tools
+%package tools
 Summary:       Miscleanous tools for SpamAssassin
 Summary(pl):   Przeró¿ne narzêdzia zwi±zane z SpamAssassin
 Group:         Applications/Mail
 Obsoletes:     SpamAssassin-tools
 
-%description -n spamassassin-tools
+%description tools
 Miscleanous tools from various authors, distributed with SpamAssassin.
 See /usr/share/doc/SpamAssassin-tools-*/.
 
-%description -n spamassassin-tools -l pl
+%description tools -l pl
 Przeró¿ne narzêdzia, dystrybuowane razem z SpamAssassin. Zobacz
 /usr/share/doc/SpamAssassin-tools-*/.
 
+
+%package -n perl-Mail-SpamAssassin
+Summary:       %{pdir}::%{pnam} -- SpamAssassin e-mail filter Perl modules
+Summary(pl):   %{pdir}::%{pnam} -- modu³y Perla filtru poczty SpamAssassin
+Group:         Development/Languages/Perl
+
+%description -n perl-Mail-SpamAssassin
+Mail::SpamAssassin is a Mail::Audit plugin to identify spam using text
+analysis and several internet-based realtime blacklists. Using its
+rule base, it uses a wide range of heuristic tests on mail headers and
+body text to identify ``spam'', also known as unsolicited commercial
+email. Once identified, the mail can then be optionally tagged as spam
+for later filtering using the user's own mail user-agent application.
+
+%description -n perl-Mail-SpamAssassin -l pl
+Mail::SpamAssassin jest pluginem dla Mail::Audit, s³u¿±cym do
+identyfikacji spamu przy u¿yciu analizy zawarto¶ci i/lub internetowych
+czarnych list. Do zidentyfikowania jako ,,spam'' stosuje szeroki
+zakres testów heurystycznych na nag³ówkach i tre¶ci, posi³kuj±c siê
+stworzon± wcze¶niej baz± regu³. Po zidentyfikowaniu, poczta mo¿e byæ
+oznaczona jako spam w celu pó¼niejszego wyfiltrowania, np. przy u¿yciu
+aplikacji do czytania poczty.
+
+
 %prep -q
 %setup -q -n %{pdir}-%{pnam}-%{version}
-#%patch0 -p1
 %patch0 -p0
 %patch1 -p1
 
@@ -102,7 +102,7 @@ install spamd/pld-rc-script.sh $RPM_BUILD_ROOT/etc/rc.d/init.d/spamassassin
 
 rm -f spamd/{*.sh,*.conf,spam*} spamproxy/spamproxyd*
 
-%post -n spamassassin
+%post
 if [ $1 = 1 ]; then
        /sbin/chkconfig --add spamassassin
 fi
@@ -112,7 +112,7 @@ else
        echo 'Run "/etc/rc.d/init.d/spamassassin start" to start the spamd daemon.'
 fi
 
-%preun -n spamassassin
+%preun
 if [ $1 = 0 ]; then
        if [ -f /var/lock/subsys/spamassassin ]; then
                /etc/rc.d/init.d/spamassassin stop 1>&2
@@ -125,19 +125,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{perl_sitelib}/Mail/*
-%{perl_sitelib}/auto/Mail/*
-%{_mandir}/man3/*
-
-%files -n spamassassin
-%defattr(644,root,root,755)
 %doc Changes README TODO sample-nonspam.txt sample-spam.txt spamd spamproxy
 %attr(755,root,root) %{_bindir}/*
-%config(noreplace) %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/spamassassin
+%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/spamassassin
 %config(noreplace) %{_sysconfdir}/mail/spamassassin
 %config(noreplace) %{_datadir}/spamassassin
 %{_mandir}/man1/*
 
-%files -n spamassassin-tools
+%files tools
 %defattr(644,root,root,755)
 %doc sql tools masses contrib
+
+%files -n perl-Mail-SpamAssassin
+%defattr(644,root,root,755)
+%{perl_sitelib}/Mail/*
+%{perl_sitelib}/auto/Mail/*
+%{_mandir}/man3/*