From 9f7184035e959f00951f3574c0765ace7ed9957d Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 12:38:38 +0000 Subject: [PATCH] =?UTF-8?q?auto-import=20changelog=20data=20from=20spamass?= =?UTF-8?q?assin-2.63-8.src.rpm=20Sun=20May=2002=202004=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=202.63-8=20-=20#12223?= =?UTF-8?q?3=20-=20Require=20perl(:MODULE=5FCOMPAT=5F*).=20-=20Use=20%{=5F?= =?UTF-8?q?mandir}=20and=20%{=5Finitrddir}.=20-=20Fix=20License=20tag=20an?= =?UTF-8?q?d=20include=20License=20in=20docs.=20-=20Backslashify=20multili?= =?UTF-8?q?ne=20init=20script=20description.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spamassassin.spec | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/spamassassin.spec b/spamassassin.spec index ec1e0f8..a232659 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -2,14 +2,13 @@ %define name spamassassin %define real_name Mail-SpamAssassin -%define initdir %{_initrddir} %define krb5backcompat %([ -a /usr/kerberos/include/krb5.h ] && echo 1 || echo 0) Summary: Spam filter for email which can be invoked from mail delivery agents. Name: %{name} Version: 2.63 -Release: 7 -License: Artistic +Release: 8 +License: GPL or Artistic Group: Applications/Internet URL: http://spamassassin.org/ Source0: http://spamassassin.org/devel/Mail-SpamAssassin-%{version}.tar.bz2 @@ -22,7 +21,8 @@ Source99: filter-requires-spamassassin.sh # Patch: spamassassin-2.50-servicename.patch # Patch2: spamassassin-2.50-chld.patch Patch3: spamassassin-2.63-krb5-backcompat.patch -Requires: %(perl -le 'use Config; print $Config{sitelibexp}') +Patch4: spamassassin-2.63-init.patch +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Buildroot: %{_tmppath}/%{name}-root Prefix: %{_prefix} Requires: /sbin/chkconfig /sbin/service @@ -67,6 +67,8 @@ echo %{krb5backcompat} %if %{krb5backcompat} %patch3 -p1 %endif +%patch4 -p0 +chmod 644 License %build export CFLAGS="$RPM_OPT_FLAGS" @@ -79,12 +81,12 @@ export CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT %makeinstall PREFIX=%buildroot/%{prefix} \ - INSTALLMAN1DIR=%buildroot/%{prefix}/share/man/man1 \ - INSTALLMAN3DIR=%buildroot/%{prefix}/share/man/man3 \ + INSTALLMAN1DIR=%buildroot/%{_mandir}/man1 \ + INSTALLMAN3DIR=%buildroot/%{_mandir}/man3 \ LOCAL_RULES_DIR=%{buildroot}/etc/mail/spamassassin chmod 755 %buildroot/%{_bindir}/* # allow stripping -install -d %buildroot/%{initdir} -install -m 0755 spamd/redhat-rc-script.sh %buildroot/%{initdir}/spamassassin +install -d %buildroot/%{_initrddir} +install -m 0755 spamd/redhat-rc-script.sh %buildroot/%{_initrddir}/spamassassin mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig @@ -113,7 +115,8 @@ fi %files -f %{name}-%{version}-filelist %defattr(-,root,root) %doc README Changes sample-nonspam.txt sample-spam.txt spamd/README.spamd -%config(noreplace) %{initdir}/spamassassin +%doc License +%config(noreplace) %{_initrddir}/spamassassin %config(noreplace) %{_sysconfdir}/mail/spamassassin %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin @@ -143,6 +146,13 @@ fi exit 0 %changelog +* Sun May 2 2004 Ville Skyttä - 2.63-8 +- #122233 +- Require perl(:MODULE_COMPAT_*). +- Use %%{_mandir} and %%{_initrddir}. +- Fix License tag and include License in docs. +- Backslashify multiline init script description. + * Fri Feb 13 2004 Elliot Lee - rebuilt